Author: markt
Date: Mon Sep 5 13:21:28 2011
New Revision: 1165273
URL: http://svn.apache.org/viewvc?rev=1165273&view=rev
Log:
Move stage update to before point where we might break out of the keep-alive
loop
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
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=1165273&r1=1165272&r2=1165273&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Mon Sep
5 13:21:28 2011
@@ -316,7 +316,9 @@ public class Http11AprProcessor extends
inputBuffer.nextRequest();
outputBuffer.nextRequest();
}
-
+
+ rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
+
// Do sendfile as needed: add socket to sendfile and end
if (sendfileData != null && !error) {
sendfileData.socket = socketRef;
@@ -339,8 +341,6 @@ public class Http11AprProcessor extends
break;
}
}
-
- rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
}
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
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=1165273&r1=1165272&r2=1165273&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Mon Sep
5 13:21:28 2011
@@ -377,7 +377,9 @@ public class Http11NioProcessor extends
inputBuffer.nextRequest();
outputBuffer.nextRequest();
}
-
+
+ rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
+
// Do sendfile as needed: add socket to sendfile and end
if (sendfileData != null && !error) {
((KeyAttachment) socketWrapper).setSendfileData(sendfileData);
@@ -389,8 +391,6 @@ public class Http11NioProcessor extends
(KeyAttachment) socketWrapper, true, true);
break;
}
-
- rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
}
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1165273&r1=1165272&r2=1165273&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon Sep 5
13:21:28 2011
@@ -310,13 +310,13 @@ public class Http11Processor extends Abs
outputBuffer.nextRequest();
}
+ rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
+
// If we don't have a pipe-lined request allow this thread to be
// used by another connection
if (isAsync() || error || inputBuffer.lastValid == 0) {
break;
}
-
- rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
}
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
