You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/11/23 23:49:21 UTC
svn commit: r1641265 - in /tomcat/trunk/java/org/apache/coyote/http11:
AbstractHttp11Processor.java Http11AprProcessor.java
Http11Nio2Processor.java Http11NioProcessor.java
Author: markt
Date: Sun Nov 23 22:49:21 2014
New Revision: 1641265
URL: http://svn.apache.org/r1641265
Log:
Remove code that is NO-OP in all remaining implementations.
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=1641265&r1=1641264&r2=1641265&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:21 2014
@@ -917,12 +917,6 @@ public abstract class AbstractHttp11Proc
/**
- * Configures the timeout to be used for reading the request line.
- */
- protected abstract void setRequestLineReadTimeout() throws IOException;
-
-
- /**
* Defines how a connector handles an incomplete request line read.
*
* @return <code>true</code> if the processor should break out of the
@@ -969,8 +963,6 @@ public abstract class AbstractHttp11Proc
// Parsing the request header
try {
- setRequestLineReadTimeout();
-
if (!getInputBuffer().parseRequestLine(keptAlive)) {
if (handleIncompleteRequestLineRead()) {
break;
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=1641265&r1=1641264&r2=1641265&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:21 2014
@@ -17,7 +17,6 @@
package org.apache.coyote.http11;
import java.io.ByteArrayInputStream;
-import java.io.IOException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
@@ -94,30 +93,6 @@ public class Http11AprProcessor extends
@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
-
- // APR uses simulated blocking so if some request line data is present
- // then it must all be presented (with the normal socket timeout).
-
- // When entering the processing loop for the first time there will
- // always be some data to read so the keep-alive timeout is not required
-
- // For the second and subsequent executions of the processing loop, if
- // there is no request line data present then no further data will be
- // read from the socket. If there is request line data present then it
- // must all be presented (with the normal socket timeout)
-
- // When the socket is created it is given the correct timeout.
- // sendfile may change the timeout but will restore it
- // This processor may change the timeout for uploads but will restore it
-
- // NO-OP
- }
-
-
- @Override
protected boolean handleIncompleteRequestLineRead() {
// This means that no data is available right now
// (long keepalive), so that the processor should be recycled
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=1641265&r1=1641264&r2=1641265&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:21 2014
@@ -121,27 +121,6 @@ public class Http11Nio2Processor extends
@Override
- protected void setRequestLineReadTimeout() throws IOException {
- // socket.setTimeout()
- // - timeout used by poller
- // socket.getSocket().getIOChannel().socket().setSoTimeout()
- // - timeout used for blocking reads
-
- // When entering the processing loop there will always be data to read
- // so no point changing timeouts at this point
-
- // For the second and subsequent executions of the processing loop, a
- // non-blocking read is used so again no need to set the timeouts
-
- // Because NIO supports non-blocking reading of the request line and
- // headers the timeouts need to be set when returning the socket to
- // the poller rather than here.
-
- // NO-OP
- }
-
-
- @Override
protected boolean handleIncompleteRequestLineRead() {
// Haven't finished reading the request so keep the socket
// open
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=1641265&r1=1641264&r2=1641265&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:21 2014
@@ -115,27 +115,6 @@ public class Http11NioProcessor extends
@Override
- protected void setRequestLineReadTimeout() throws IOException {
- // socket.setTimeout()
- // - timeout used by poller
- // socket.getSocket().getIOChannel().socket().setSoTimeout()
- // - timeout used for blocking reads
-
- // When entering the processing loop there will always be data to read
- // so no point changing timeouts at this point
-
- // For the second and subsequent executions of the processing loop, a
- // non-blocking read is used so again no need to set the timeouts
-
- // Because NIO supports non-blocking reading of the request line and
- // headers the timeouts need to be set when returning the socket to
- // the poller rather than here.
-
- // NO-OP
- }
-
-
- @Override
protected boolean handleIncompleteRequestLineRead() {
// Haven't finished reading the request so keep the socket
// open
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org