From: Eric Covener <covener@apache.org>
Date: Fri, 25 Jul 2014 18:54:03 +0000 (+0000)
Subject: mod_proxy_wstunnel: Concurrent websockets messages could be
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=14398fa8efe1e12307419055ce17098f23527259;p=thirdparty%2Fapache%2Fhttpd.git

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 f549df80464..a20bdd9ea70 100644
--- 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 6fffb822c1a..e278cd14852 100644
--- 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--;