httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r1613493 - in /httpd/httpd/trunk: CHANGES server/mpm/event/event.c
Date Fri, 25 Jul 2014 18:54:04 GMT
Author: covener
Date: Fri Jul 25 18:54:03 2014
New Revision: 1613493

URL: http://svn.apache.org/r1613493
Log:
mod_proxy_wstunnel: Concurrent websockets messages could be 
lost or delayed with ProxyWebsocketAsync enabled.  

Submitted By: Edward Lu
Committed By: covener

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/server/mpm/event/event.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1613493&r1=1613492&r2=1613493&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Jul 25 18:54:03 2014
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_proxy_wstunnel: Concurrent websockets messages could be 
+     lost or delayed with ProxyWebsocketAsync enabled.  
+     [Edward Lu <Chaosed0 gmail.com>]
+
   *) core, mod_info: Add compiled and loaded PCRE versions to version
      number display.  [Rainer Jung]
 

Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1613493&r1=1613492&r2=1613493&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Fri Jul 25 18:54:03 2014
@@ -1968,14 +1968,13 @@ static void * APR_THREAD_FUNC listener_t
                                                baton->user_baton, 
                                                0, /* don't insert it */
                                                NULL /* no associated socket callback */);
-                    /* remove other sockets in my set */
+                    /* remove all sockets in my set */
                     for (i = 0; i < baton->nsock; i++) { 
                         apr_pollset_remove(event_pollset, baton->pfds[i]); 
                     }
 
                     push_timer2worker(te);
                 }
-                apr_pollset_remove(event_pollset, out_pfd);
             }
             out_pfd++;
             num--;



Mime
View raw message