From: Takashi Sato <takashi@apache.org>
Date: Wed, 25 Jun 2014 09:42:41 +0000 (+0000)
Subject: follow up r1601943:
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0660bd1cf4f7f533369ded9b7615a6d5c3ad9c96;p=thirdparty%2Fapache%2Fhttpd.git

follow up r1601943:
Each apr_pollset_poll modified *out_pfd, so we need to copy it.


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

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 2d96189fcb2..ae49c01ca15 100644
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -1969,10 +1969,12 @@ static void * APR_THREAD_FUNC listener_thread(apr_thread_t * thd, void *dummy)
 
                 /* We only signal once per N sockets with this baton */
                 if (!(baton->signaled)) { 
+                    apr_pollfd_t *newpfd = apr_palloc(out_pfd->p, sizeof(apr_pollfd_t));
                     baton->signaled = 1;
+                    *newpfd = *out_pfd;
                     te = event_get_timer_event(-1 /* fake timer */, 
                                                socket_callback_wrapper, 
-                                               (apr_pollfd_t *)out_pfd,
+                                               newpfd,
                                                0, /* don't insert it */
                                                NULL /* no associated socket callback */);
                     /* remove other sockets in my set */