]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
On the trunk:
authorStefan Eissing <icing@apache.org>
Tue, 11 Apr 2017 13:41:44 +0000 (13:41 +0000)
committerStefan Eissing <icing@apache.org>
Tue, 11 Apr 2017 13:41:44 +0000 (13:41 +0000)
mpm_winnt: always invoke ap_lingering_close() at connection end.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790973 13f79535-47bb-0310-9956-ffa450edef68

server/mpm/winnt/child.c

index 6f9625b421409c1587b33c75a9be6cf576befc25..45b22a0d34eca9ef57a1afb59a997e0578facff5 100644 (file)
@@ -817,10 +817,8 @@ 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);