Author: markt
Date: Wed Nov 12 10:48:32 2014
New Revision: 1638742
URL: http://svn.apache.org/r1638742
Log:
Don't check the last access time since:
- it will always be > -1
- checking keptAlive is sufficient to determine if the keep alive
timeout should be set
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java?rev=1638742&r1=1638741&r2=1638742&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java Wed Nov
12 10:48:32 2014
@@ -155,7 +155,7 @@ public class Http11Nio2Processor extends
// Check to see if we have read any of the request line yet
if (((InternalNio2InputBuffer)
inputBuffer).getParsingRequestLinePhase() < 1) {
- if (socketWrapper.getLastAccess() > -1 || keptAlive) {
+ if (keptAlive) {
// Haven't read the request line and have previously processed
a
// request. Must be keep-alive. Make sure poller uses
keepAlive.
socketWrapper.setTimeout(endpoint.getKeepAliveTimeout());
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=1638742&r1=1638741&r2=1638742&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Wed Nov
12 10:48:32 2014
@@ -149,7 +149,7 @@ public class Http11NioProcessor extends
// Check to see if we have read any of the request line yet
if (((InternalNioInputBuffer)
inputBuffer).getParsingRequestLinePhase() < 2) {
- if (socketWrapper.getLastAccess() > -1 || keptAlive) {
+ if (keptAlive) {
// Haven't read the request line and have previously processed
a
// request. Must be keep-alive. Make sure poller uses
keepAlive.
socketWrapper.setTimeout(endpoint.getKeepAliveTimeout());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
