In some circumstances asynchronous requests could time out too soon.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1567634 13f79535-47bb-0310-9956-ffa450edef68
IallenSi · Feb 12, 2014 · 2a6c5a8 · 2a6c5a8
1 parent fd0d862
commit 2a6c5a8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
@@ -521,6 +521,8 @@ public final void action(ActionCode actionCode, Object param) {
 
         } else if (actionCode == ActionCode.ASYNC_START) {
             asyncStateMachine.asyncStart((AsyncContextCallback) param);
+            // Async time out is based on SocketWrapper access time
+            getSocketWrapper().access();
 
         } else if (actionCode == ActionCode.ASYNC_COMPLETE) {
             socketWrapper.clearDispatches();

diff --git a/java/org/apache/coyote/http11/AbstractHttp11Processor.java b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
@@ -795,6 +795,8 @@ public final void action(ActionCode actionCode, Object param) {
             internalBuffer.addActiveFilter(savedBody);
         } else if (actionCode == ActionCode.ASYNC_START) {
             asyncStateMachine.asyncStart((AsyncContextCallback) param);
+            // Async time out is based on SocketWrapper access time
+            getSocketWrapper().access();
         } else if (actionCode == ActionCode.ASYNC_DISPATCHED) {
             asyncStateMachine.asyncDispatched();
         } else if (actionCode == ActionCode.ASYNC_TIMEOUT) {

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -62,6 +62,14 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Coyote">
+    <changelog>
+      <fix>
+        In some circumstances asynchronous requests could time out too soon.
+        (markt)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Other">
     <changelog>
       <fix>