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 2013/08/31 00:52:14 UTC
svn commit: r1519106 -
/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
Author: markt
Date: Fri Aug 30 22:52:14 2013
New Revision: 1519106
URL: http://svn.apache.org/r1519106
Log:
Align the setting of the keep-alive timeout with the NIO implementation
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1519106&r1=1519105&r2=1519106&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Fri Aug 30 22:52:14 2013
@@ -110,13 +110,8 @@ public class AjpProcessor extends Abstra
error = false;
while (!error && !endpoint.isPaused()) {
-
// Parsing the request header
try {
- // Set keep alive timeout if enabled
- if (keepAliveTimeout > 0) {
- socket.getSocket().setSoTimeout(keepAliveTimeout);
- }
// Get first message of the request
if (!readMessage(requestHeaderMessage, true)) {
// This means a connection timeout
@@ -225,6 +220,11 @@ public class AjpProcessor extends Abstra
request.updateCounters();
rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
+ // Set keep alive timeout if enabled
+ if (keepAliveTimeout > 0) {
+ socket.getSocket().setSoTimeout(keepAliveTimeout);
+ }
+
recycle(false);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org