tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1006358 - in /tomcat/trunk: java/org/apache/coyote/http11/Http11AprProcessor.java java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml
Date Sun, 10 Oct 2010 22:10:28 GMT
Author: markt
Date: Sun Oct 10 22:10:27 2010
New Revision: 1006358

URL: http://svn.apache.org/viewvc?rev=1006358&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50044 for APR connector

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
    tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1006358&r1=1006357&r2=1006358&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Sun Oct 10 22:10:27
2010
@@ -597,7 +597,7 @@ public class Http11AprProcessor extends 
         } 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) {

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=1006358&r1=1006357&r2=1006358&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Sun Oct 10 22:10:27 2010
@@ -989,9 +989,11 @@ public class AprEndpoint extends Abstrac
                     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);
+                        }
                     }
                 }
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1006358&r1=1006357&r2=1006358&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Oct 10 22:10:27 2010
@@ -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>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message