From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 6 Sep 2011 17:35:39 +0000 (+0000)
Subject: Fix keep-alive broken by refactoring
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=07b843c31e4723a432a8cb674cb8a7d6a5eb300d;p=tomcat7.0

Fix keep-alive broken by refactoring

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1165765 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java
index 42af620b0..1be388840 100644
--- a/java/org/apache/coyote/http11/Http11AprProcessor.java
+++ b/java/org/apache/coyote/http11/Http11AprProcessor.java
@@ -420,6 +420,7 @@ public class Http11AprProcessor extends AbstractHttp11Processor<Long> {
 
     @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();
diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java
index da1f6e458..6b4178cd3 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -409,6 +409,7 @@ public class Http11Processor extends AbstractHttp11Processor<Socket> {
 
     @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) {