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

diff --git a/STATUS b/STATUS
index 7edefb3ce66618031c201f224e01459e1c8c4d0e..dd7f484fa4516e6fc01464811f5679632d638356 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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

diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index ec8c5a26793ad5460b6e9066caa71a2b1f39be09..99e8d3e3436467e77b9061cf8023882971bb4bba 100644 (file)
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -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);