svn commit: r1165282 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Processor.java Http11AprProcessor.java Http11NioProcessor.java Http11Processor.java

[markt]

Author: markt
Date: Mon Sep  5 13:45:14 2011
New Revision: 1165282

URL: http://svn.apache.org/viewvc?rev=1165282&view=rev
Log:
Refactoring prep for extracting sendfile code to a separate method

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
    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/AbstractHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1165282&r1=1165281&r2=1165282&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Mon 
Sep  5 13:45:14 2011
@@ -79,6 +79,12 @@ public abstract class AbstractHttp11Proc
 
 
     /**
+     * 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;

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=1165282&r1=1165281&r2=1165282&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:45:14 2011
@@ -181,6 +181,7 @@ public class Http11AprProcessor extends 
         error = false;
         keepAlive = true;
         comet = false;
+        openSocket = false;
 
         int soTimeout = endpoint.getSoTimeout();
 
@@ -189,7 +190,6 @@ public class Http11AprProcessor extends 
         }
 
         boolean keptAlive = false;
-        boolean openSocket = false;
         boolean sendfileInProgress = false;
 
         long socketRef = socketWrapper.getSocket().longValue();

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=1165282&r1=1165281&r2=1165282&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:45:14 2011
@@ -210,6 +210,7 @@ public class Http11NioProcessor extends 
         error = false;
         keepAlive = true;
         comet = false;
+        openSocket = false;
         
         int soTimeout = endpoint.getSoTimeout();
 
@@ -218,7 +219,6 @@ public class Http11NioProcessor extends 
         }
 
         boolean keptAlive = false;
-        boolean openSocket = false;
         boolean readComplete = true;
         
         while (!error && keepAlive && !comet && !isAsync() && 
!endpoint.isPaused()) {

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=1165282&r1=1165281&r2=1165282&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:45:14 2011
@@ -145,6 +145,7 @@ public class Http11Processor extends Abs
         error = false;
         keepAlive = true;
         comet = false;
+        openSocket = false;
 
         int soTimeout = endpoint.getSoTimeout();
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org