mod_proxy_wstunnel: Concurrent websockets messages could be

lost or delayed with ProxyWebsocketAsync enabled.

Submitted By: Edward Lu
Committed By: covener

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

diff --git a/CHANGES b/CHANGES
index f549df80464933c4439960bbd66416b5fe68559c..a20bdd9ea701c4d4e11542807b7fb68ce894c250 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 6fffb822c1a5653d69e04154eda474d0704c6ead..e278cd14852451b735b183715514301203b9c027 100644 (file)
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -1968,14 +1968,13 @@ static void * APR_THREAD_FUNC listener_thread(apr_thread_t * thd, void *dummy)
                                                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--;