On the 2.4.x branch:

Merged /httpd/httpd/trunk:r1790973,1790978

mpm_winnt: always invoke ap_lingering_close() at connection end as in
     all other mpm modules, giving everyone a chance to cleanup at prep
     lingering close hook.

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

diff --git a/STATUS b/STATUS
index 2bc157b5c87b101b5e7ef110b5fb5d8a97173a53..266695f8bc4895d6662d0d7062d9d9b1f2a57a20 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -145,14 +145,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mpm_winnt: always invoke ap_lingering_close() at connection end as in
-     all other mpm modules, giving everyone a chance to cleanup at prep
-     lingering close hook.
-     trunk patch: http://svn.apache.org/r1790973
-     trunk patch: http://svn.apache.org/r1790978
-     2.4.x patch: trunk works 
-     +1: icing, steffen, jim (inspection)
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index 94a1438c60769d9449645ee50ca3eff988b08701..ec8c5a26793ad5460b6e9066caa71a2b1f39be09 100644 (file)
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -813,13 +813,11 @@ static DWORD __stdcall worker_main(void *thread_num_val)
 
         ap_process_connection(c, context->sock);
 
-        apr_socket_opt_get(context->sock, APR_SO_DISCONNECTED, &disconnected);
+        ap_lingering_close(c);
 
+        apr_socket_opt_get(context->sock, APR_SO_DISCONNECTED, &disconnected);
         if (!disconnected) {
             context->accept_socket = INVALID_SOCKET;
-            if (!c->aborted) { 
-                ap_lingering_close(c);
-            }
         }
     }