tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1641264 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Processor.java Http11AprProcessor.java Http11Nio2Processor.java Http11NioProcessor.java
Date Sun, 23 Nov 2014 22:49:08 GMT
Author: markt
Date: Sun Nov 23 22:49:07 2014
New Revision: 1641264

URL: http://svn.apache.org/r1641264
Log:
Remove unused BIO HTTP specific code

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1641264&r1=1641263&r2=1641264&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Sun Nov 23 22:49:07
2014
@@ -917,14 +917,6 @@ public abstract class AbstractHttp11Proc
 
 
     /**
-     * Processors (currently only HTTP BIO) may elect to disable HTTP keep-alive
-     * in some circumstances. This method allows the processor implementation to
-     * determine if keep-alive should be disabled or not.
-     */
-    protected abstract boolean disableKeepAlive();
-
-
-    /**
      * Configures the timeout to be used for reading the request line.
      */
     protected abstract void setRequestLineReadTimeout() throws IOException;
@@ -972,10 +964,6 @@ public abstract class AbstractHttp11Proc
         readComplete = true;
         keptAlive = false;
 
-        if (disableKeepAlive()) {
-            socketWrapper.setKeepAliveLeft(0);
-        }
-
         while (!getErrorState().isError() && keepAlive && !isAsync() &&
                 httpUpgradeHandler == null && !endpoint.isPaused()) {
 

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1641264&r1=1641263&r2=1641264&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Sun Nov 23 22:49:07
2014
@@ -94,12 +94,6 @@ public class Http11AprProcessor extends 
 
 
     @Override
-    protected boolean disableKeepAlive() {
-        return false;
-    }
-
-
-    @Override
     protected void setRequestLineReadTimeout() throws IOException {
         // Timeouts while in the poller are handled entirely by the poller
         // Only need to be concerned with socket timeouts

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java?rev=1641264&r1=1641263&r2=1641264&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java Sun Nov 23 22:49:07
2014
@@ -121,12 +121,6 @@ public class Http11Nio2Processor extends
 
 
     @Override
-    protected boolean disableKeepAlive() {
-        return false;
-    }
-
-
-    @Override
     protected void setRequestLineReadTimeout() throws IOException {
         // socket.setTimeout()
         //     - timeout used by poller

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1641264&r1=1641263&r2=1641264&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Sun Nov 23 22:49:07
2014
@@ -115,12 +115,6 @@ public class Http11NioProcessor extends 
 
 
     @Override
-    protected boolean disableKeepAlive() {
-        return false;
-    }
-
-
-    @Override
     protected void setRequestLineReadTimeout() throws IOException {
         // socket.setTimeout()
         //     - timeout used by poller



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message