Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50044 for APR connector

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1006358 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java
index a0911af..a5b374b 100644 (file)
--- a/java/org/apache/coyote/http11/Http11AprProcessor.java
+++ b/java/org/apache/coyote/http11/Http11AprProcessor.java
@@ -597,7 +597,7 @@ public class Http11AprProcessor extends AbstractHttp11Processor {
         } else if (actionCode == ActionCode.COMET_END) {
             comet = false;
         } else if (actionCode == ActionCode.COMET_CLOSE) {
-            //no op
+            endpoint.processSocketAsync(this.socket, SocketStatus.OPEN);
         } else if (actionCode == ActionCode.COMET_SETTIMEOUT) {
             //no op
         } else if (actionCode == ActionCode.ASYNC_COMPLETE) {

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 4ecb2f6..fcf8349 100644 (file)
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -989,9 +989,11 @@ public class AprEndpoint extends AbstractEndpoint {
                     waitingRequests.iterator();
                 while (sockets.hasNext()) {
                     SocketWrapper<Long> socket = sockets.next();
-                    long access = socket.getLastAccess();
-                    if ((now-access)>socket.getTimeout()) {
-                        processSocketAsync(socket,SocketStatus.TIMEOUT);
+                    if (socket.async) {
+                        long access = socket.getLastAccess();
+                        if ((now-access)>socket.getTimeout()) {
+                            processSocketAsync(socket,SocketStatus.TIMEOUT);
+                        }
                     }
                 }
 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 67e10ed..36cb935 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -134,6 +134,11 @@
         (kfujino) 
       </fix>
       <fix>
+        <bug>50044</bug>: Fix issue in APR/native connector when using comet
+        where socket remained in long poll after the comet request has ended.
+        (markt) 
+      </fix>
+      <fix>
         <bug>50054</bug>: Correctly handle the setting of minSpareThreads in 
         AJP connector. (kfujino) 
       </fix>