Commit c61c5b59 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent 153edfc0

STATUS

+0 −4
Original line number Diff line number Diff line
@@ -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 ]

server/mpm/event/event.c

+1 −1
Original line number Diff line number Diff line
@@ -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