Refactoring prep for extracting sendfile code to a separate method

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

diff --git a/java/org/apache/coyote/http11/AbstractHttp11Processor.java b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
index 0baadc0..50e1699 100644 (file)
--- a/java/org/apache/coyote/http11/AbstractHttp11Processor.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
@@ -79,6 +79,12 @@ public abstract class AbstractHttp11Processor<S> extends AbstractProcessor<S> {
 
 
     /**
+     * Flag used to indicate that the socket should be kept open (e.g. for keep
+     * alive or send file.
+     */
+    protected boolean openSocket = false;
+
+    /**
      * HTTP/1.1 flag.
      */
     protected boolean http11 = true;

diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java
index 22725ec..d567e91 100644 (file)
--- a/java/org/apache/coyote/http11/Http11AprProcessor.java
+++ b/java/org/apache/coyote/http11/Http11AprProcessor.java
@@ -181,6 +181,7 @@ public class Http11AprProcessor extends AbstractHttp11Processor<Long> {
         error = false;
         keepAlive = true;
         comet = false;
+        openSocket = false;
 
         int soTimeout = endpoint.getSoTimeout();
 
@@ -189,7 +190,6 @@ public class Http11AprProcessor extends AbstractHttp11Processor<Long> {
         }
 
         boolean keptAlive = false;
-        boolean openSocket = false;
         boolean sendfileInProgress = false;
 
         long socketRef = socketWrapper.getSocket().longValue();

diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index ae746cb..1c004f4 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -210,6 +210,7 @@ public class Http11NioProcessor extends AbstractHttp11Processor<NioChannel> {
         error = false;
         keepAlive = true;
         comet = false;
+        openSocket = false;
         
         int soTimeout = endpoint.getSoTimeout();
 
@@ -218,7 +219,6 @@ public class Http11NioProcessor extends AbstractHttp11Processor<NioChannel> {
         }
 
         boolean keptAlive = false;
-        boolean openSocket = false;
         boolean readComplete = true;
         
         while (!error && keepAlive && !comet && !isAsync() && !endpoint.isPaused()) {

diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java
index 12642b7..e1d6d97 100644 (file)
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -145,6 +145,7 @@ public class Http11Processor extends AbstractHttp11Processor<Socket> {
         error = false;
         keepAlive = true;
         comet = false;
+        openSocket = false;
 
         int soTimeout = endpoint.getSoTimeout();