Pull up keep-alive

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1654316 13f79535-47bb-0310-9956-ffa450edef68
apache · Jan 23, 2015 · 7d929d3 · 7d929d3
1 parent a91bd9f
commit 7d929d3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -1929,8 +1929,6 @@ public static class SendfileData extends SendfileDataBase {
         public long socket;
         // Position
         public long pos;
-        // KeepAlive flag
-        public boolean keepAlive;
     }
 
 

diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -1621,8 +1621,6 @@ public static class SendfileData extends SendfileDataBase {
         public FileChannel fchannel;
         public long pos;
         public long length;
-        // KeepAlive flag
-        public boolean keepAlive;
         // Internal use only
         private Nio2SocketWrapper socket;
         private ByteBuffer buffer;

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1761,7 +1761,5 @@ public static class SendfileData extends SendfileDataBase {
         public volatile FileChannel fchannel;
         public volatile long pos;
         public volatile long length;
-        // KeepAlive flag
-        public volatile boolean keepAlive;
     }
 }
diff --git a/java/org/apache/tomcat/util/net/SendfileDataBase.java b/java/org/apache/tomcat/util/net/SendfileDataBase.java
@@ -18,4 +18,11 @@
 
 public abstract class SendfileDataBase {
 
+    /**
+     * Is the current request being processed on a keep-alive connection? This
+     * determines if the socket is closed once the send file completes or if
+     * processing continues with the next request on the connection (or waiting
+     * for that next request to arrive).
+     */
+    public boolean keepAlive;
 }