Author: markt
Date: Wed Jan 29 20:37:31 2014
New Revision: 1562581
URL: http://svn.apache.org/r1562581
Log:
Fix regression in fix for BZ55996
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java?rev=1562581&r1=1562580&r2=1562581&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java Wed Jan 29
20:37:31 2014
@@ -27,7 +27,7 @@ public class SocketWrapper<E> {
private volatile E socket;
- private volatile long lastAccess = -1;
+ private volatile long lastAccess = System.currentTimeMillis();
private long timeout = -1;
private boolean error = false;
private volatile int keepAliveLeft = 100;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1562581&r1=1562580&r2=1562581&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jan 29 20:37:31 2014
@@ -45,13 +45,23 @@
issues to not "pop up" wrt. others).
-->
<section name="Tomcat 8.0.1 (markt)">
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ Correct regression in the fix for <bug>55996</bug> that meant that
+ asynchronous requests might timeout too early. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="WebSocket">
<changelog>
- Do not return an empty string for the <code>Sec-WebSocket-Protocol</code>
- HTTP header when no sub-protocol has been requested or no sub-protocol
- could be agreed as RFC6455 requires that no
- <code>Sec-WebSocket-Protocol</code> header is returned in this case.
- (markt)
+ <fix>
+ Do not return an empty string for the
+ <code>Sec-WebSocket-Protocol</code> HTTP header when no sub-protocol
has
+ been requested or no sub-protocol could be agreed as RFC6455 requires
+ that no <code>Sec-WebSocket-Protocol</code> header is returned in this
+ case. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
