From: Jim Jagielski <jim@apache.org>
Date: Mon, 10 Oct 2016 12:32:38 +0000 (+0000)
Subject: Merge r1732228 from trunk:
X-Git-Tag: 2.4.24~203
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f1a2a654c1c01216a8a00d1f5701c6e0b1861ca;p=apache

Merge r1732228 from trunk:

correct type

Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1764078 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 9b3ef7cbae..40d4737a79 100644
--- a/STATUS
+++ b/STATUS
@@ -117,10 +117,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) event: Don't assume sizeof.
-     trunk patch: http://svn.apache.org/r1732228
-     2.4.x patch: trunk works
-     +1: jim, ylavic, elukey
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index e53ea0f5ff..9871a5f0f0 100644
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -2065,7 +2065,7 @@ static void *APR_THREAD_FUNC start_threads(apr_thread_t * thd, void *dummy)
     }
 
     /* Create the main pollset */
-    for (i = 0; i < sizeof(good_methods) / sizeof(void*); i++) {
+    for (i = 0; i < sizeof(good_methods) / sizeof(good_methods[0]); i++) {
         rv = apr_pollset_create_ex(&event_pollset,
                             threads_per_child*2, /* XXX don't we need more, to handle
                                                 * connections in K-A or lingering