← Back to branch summary

~ubuntu-branches/ubuntu/vivid/tomcat6/vivid-proposed

« back to all changes in this revision

Viewing changes to java/org/apache/coyote/http11/Http11NioProtocol.java

  • Committer: Package Import Robot
  • Author(s): tony mancill
  • Date: 2013-08-03 21:50:20 UTC
  • mfrom: (1.2.9)
  • Revision ID: package-import@ubuntu.com-20130803215020-glb1brkoau0zxr5x
Tags: 6.0.37-1
* New upstream release.
  - Drop patches for CVE-2012-4534, CVE-2012-4431, CVE-2012-3546,
    CVE-2012-2733, CVE-2012-3439
  - Drop 0011-CVE-02012-0022-regression-fix.patch
  - Drop 0017-eclipse-compiler-update.patch
* Freshened remaining patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/coyote/http11/Http11NioProtocol.java
29
29
import javax.management.MBeanServer;
30
30
import javax.management.ObjectName;
31
31
 
 
32
import org.apache.coyote.AbstractProtocol;
32
33
import org.apache.coyote.ActionCode;
33
34
import org.apache.coyote.ActionHook;
34
35
import org.apache.coyote.Adapter;
35
 
import org.apache.coyote.ProtocolHandler;
36
36
import org.apache.coyote.RequestGroupInfo;
37
37
import org.apache.coyote.RequestInfo;
38
38
import org.apache.tomcat.util.modeler.Registry;
 
39
import org.apache.tomcat.util.net.AbstractEndpoint;
39
40
import org.apache.tomcat.util.net.NioChannel;
40
41
import org.apache.tomcat.util.net.NioEndpoint;
41
42
import org.apache.tomcat.util.net.NioEndpoint.Handler;
54
55
 * @author Costin Manolache
55
56
 * @author Filip Hanik
56
57
 */
57
 
public class Http11NioProtocol implements ProtocolHandler, MBeanRegistration
 
58
public class Http11NioProtocol extends AbstractProtocol implements MBeanRegistration
58
59
{
59
60
    protected JSSEImplementation sslImplementation = null;
60
61
    
207
208
 
208
209
    // -------------------- Properties--------------------
209
210
    protected NioEndpoint ep=new NioEndpoint();
 
211
 
 
212
    protected final AbstractEndpoint getEndpoint() {
 
213
        return ep;
 
214
    }
 
215
 
210
216
    protected boolean secure = false;
211
217
 
212
218
    protected Hashtable attributes = new Hashtable();