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 2015/01/29 20:11:52 UTC
svn commit: r1655808 - in /tomcat/trunk/java/org/apache/coyote/http11:
AbstractHttp11Processor.java Http11AprProcessor.java
Http11Nio2Processor.java Http11NioProcessor.java
Author: markt
Date: Thu Jan 29 19:11:52 2015
New Revision: 1655808
URL: http://svn.apache.org/r1655808
Log:
Async processingdoesn't change the timeouts so no need to reset them.
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=1655808&r1=1655807&r2=1655808&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Thu Jan 29 19:11:52 2015
@@ -1715,7 +1715,6 @@ public abstract class AbstractHttp11Proc
if (!getAdapter().asyncDispatch(request, response, status)) {
setErrorState(ErrorState.CLOSE_NOW, null);
}
- resetTimeouts();
} catch (InterruptedIOException e) {
setErrorState(ErrorState.CLOSE_NOW, e);
} catch (Throwable t) {
@@ -1763,14 +1762,6 @@ public abstract class AbstractHttp11Proc
}
- /**
- * Provides a mechanism for those connector implementations (currently only
- * NIO) that need to reset timeouts from Async timeouts to standard HTTP
- * timeouts once async processing completes.
- */
- protected abstract void resetTimeouts();
-
-
public void endRequest() {
// Finish the handling of the request
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=1655808&r1=1655807&r2=1655808&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Thu Jan 29 19:11:52 2015
@@ -75,12 +75,6 @@ public class Http11AprProcessor extends
// --------------------------------------------------------- Public Methods
@Override
- protected void resetTimeouts() {
- // NO-OP for APR
- }
-
-
- @Override
public void setSslSupport(SSLSupport sslSupport) {
// NOOP for APR
}
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=1655808&r1=1655807&r2=1655808&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java Thu Jan 29 19:11:52 2015
@@ -62,6 +62,15 @@ public class Http11Nio2Processor extends
// --------------------------------------------------------- Public Methods
+ /**
+ * Set the SSL information for this HTTP connection.
+ */
+ @Override
+ public void setSslSupport(SSLSupport sslSupport) {
+ this.sslSupport = sslSupport;
+ }
+
+
@Override
public SocketState asyncDispatch(SocketStatus status) {
SocketState state = super.asyncDispatch(status);
@@ -75,21 +84,6 @@ public class Http11Nio2Processor extends
}
- @Override
- protected void resetTimeouts() {
- if (!getErrorState().isError() && socketWrapper != null &&
- asyncStateMachine.isAsyncDispatching()) {
-
- // Reset the timeout
- if (keepAlive) {
- socketWrapper.setReadTimeout(endpoint.getKeepAliveTimeout());
- } else {
- socketWrapper.setReadTimeout(endpoint.getSoTimeout());
- }
- }
- }
-
-
// ----------------------------------------------------- ActionHook Methods
/**
@@ -175,15 +169,4 @@ public class Http11Nio2Processor extends
}
}
}
-
-
- // ------------------------------------------------------ Protected Methods
-
- /**
- * Set the SSL information for this HTTP connection.
- */
- @Override
- public void setSslSupport(SSLSupport sslSupport) {
- this.sslSupport = sslSupport;
- }
}
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=1655808&r1=1655807&r2=1655808&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Thu Jan 29 19:11:52 2015
@@ -60,22 +60,14 @@ public class Http11NioProcessor extends
}
- // ------------------------------------------------------ Protected Methods
+ // --------------------------------------------------------- Public Methods
+ /**
+ * Set the SSL information for this HTTP connection.
+ */
@Override
- protected void resetTimeouts() {
- final NioEndpoint.NioSocketWrapper attach =
- (NioEndpoint.NioSocketWrapper)socketWrapper.getSocket().getAttachment();
- if (!getErrorState().isError() && attach != null &&
- asyncStateMachine.isAsyncDispatching()) {
-
- // Reset the timeout
- if (keepAlive) {
- attach.setReadTimeout(endpoint.getKeepAliveTimeout());
- } else {
- attach.setReadTimeout(endpoint.getSoTimeout());
- }
- }
+ public void setSslSupport(SSLSupport sslSupport) {
+ this.sslSupport = sslSupport;
}
@@ -164,15 +156,4 @@ public class Http11NioProcessor extends
}
}
}
-
-
- // ------------------------------------------------------ Protected Methods
-
- /**
- * Set the SSL information for this HTTP connection.
- */
- @Override
- public void setSslSupport(SSLSupport sslSupport) {
- this.sslSupport = sslSupport;
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org