]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
On the 2.4.x branch:
authorStefan Eissing <icing@apache.org>
Tue, 11 Apr 2017 13:41:05 +0000 (13:41 +0000)
committerStefan Eissing <icing@apache.org>
Tue, 11 Apr 2017 13:41:05 +0000 (13:41 +0000)
revert of r1790971, as done in wrong branch.

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

server/mpm/winnt/child.c

index cfa60987028cabb505b3653749eb7967046b5df9..94a1438c60769d9449645ee50ca3eff988b08701 100644 (file)
@@ -817,8 +817,10 @@ static DWORD __stdcall worker_main(void *thread_num_val)
 
         if (!disconnected) {
             context->accept_socket = INVALID_SOCKET;
+            if (!c->aborted) { 
+                ap_lingering_close(c);
+            }
         }
-        ap_lingering_close(c);
     }
 
     ap_update_child_status_from_indexes(0, thread_num, SERVER_DEAD, NULL);