Author: markt Date: Fri Jan 23 19:02:35 2015 New Revision: 1654316 URL: http://svn.apache.org/r1654316 Log: Pull up keep-alive
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java tomcat/trunk/java/org/apache/tomcat/util/net/SendfileDataBase.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1654316&r1=1654315&r2=1654316&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Jan 23 19:02:35 2015 @@ -1929,8 +1929,6 @@ public class AprEndpoint extends Abstrac public long socket; // Position public long pos; - // KeepAlive flag - public boolean keepAlive; } Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1654316&r1=1654315&r2=1654316&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Fri Jan 23 19:02:35 2015 @@ -1621,8 +1621,6 @@ public class Nio2Endpoint extends Abstra public FileChannel fchannel; public long pos; public long length; - // KeepAlive flag - public boolean keepAlive; // Internal use only private Nio2SocketWrapper socket; private ByteBuffer buffer; Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1654316&r1=1654315&r2=1654316&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri Jan 23 19:02:35 2015 @@ -1761,7 +1761,5 @@ public class NioEndpoint extends Abstrac public volatile FileChannel fchannel; public volatile long pos; public volatile long length; - // KeepAlive flag - public volatile boolean keepAlive; } } Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SendfileDataBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SendfileDataBase.java?rev=1654316&r1=1654315&r2=1654316&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/SendfileDataBase.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/SendfileDataBase.java Fri Jan 23 19:02:35 2015 @@ -18,4 +18,11 @@ package org.apache.tomcat.util.net; 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; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org