Author: markt
Date: Tue Sep 6 17:35:39 2011
New Revision: 1165765
URL: http://svn.apache.org/viewvc?rev=1165765&view=rev
Log:
Fix keep-alive broken by refactoring
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.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=1165765&r1=1165764&r2=1165765&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Tue Sep
6 17:35:39 2011
@@ -420,6 +420,7 @@ public class Http11AprProcessor extends
@Override
protected boolean breakKeepAliveLoop(SocketWrapper<Long> socketWrapper) {
+ openSocket = true;
// Do sendfile as needed: add socket to sendfile and end
if (sendfileData != null && !error) {
sendfileData.socket = socketWrapper.getSocket().longValue();
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=1165765&r1=1165764&r2=1165765&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue Sep 6
17:35:39 2011
@@ -409,6 +409,7 @@ public class Http11Processor extends Abs
@Override
protected boolean breakKeepAliveLoop(SocketWrapper<Socket> socketWrapper) {
+ openSocket = true;
// If we don't have a pipe-lined request allow this thread to be
// used by another connection
if (inputBuffer.lastValid == 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
