From: Stefan Eissing <icing@apache.org>
Date: Tue, 11 Apr 2017 13:41:44 +0000 (+0000)
Subject: On the trunk:
X-Git-Tag: 2.5.0-alpha~478
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=354e89a57e27909148b6cea84653fb0c9eab6db4;p=thirdparty%2Fapache%2Fhttpd.git

On the trunk:

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
---

diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index 6f9625b4214..45b22a0d34e 100644
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -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);