Commit 700b1c2a authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1801143 from trunk: 

mpm_winnt: Don't forget to close the I/O completion port as part of the
cleanup in the child process.

Submitted by: kotkov
Reviewed by: jailletc36, ylavic (by inspection), covener


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

STATUS

+0 −7
Original line number Diff line number Diff line
@@ -124,13 +124,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) mpm_winnt: Don't forget to close the I/O completion port as part of the

                cleanup in the child process.

     trunk patch: http://svn.apache.org/r1801143

     2.4.x patch: svn merge -c 1801143 ^/httpd/httpd/trunk . 

     +1: jailletc36, ylavic (by inspection), covener

     jailletc36: untested, but looks straight forward enough to vote



  *) Easy patches: synch 2.4.x and trunk

     - mod_ssl: Tweak logging message

     - mod_ssl: make ssl_io_data_dump respect per-conn loglevel

server/mpm/winnt/child.c

+1 −0
Original line number Diff line number Diff line
@@ -1255,6 +1255,7 @@ void child_main(apr_pool_t *pconf, DWORD parent_pid) 
    apr_thread_mutex_destroy(child_lock);

    apr_thread_mutex_destroy(qlock);

    CloseHandle(qwait_event);

    CloseHandle(ThreadDispatchIOCP);



    apr_pool_destroy(pchild);

    CloseHandle(exit_event);