summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorStefan Eissing <icing@apache.org>2017-04-11 13:41:05 +0000
committerStefan Eissing <icing@apache.org>2017-04-11 13:41:05 +0000
commit219b188e3439ca9bc5e2999d90667a12581668f5 (patch)
treeedd649724d5eeea7852058d6d6634b00da4692ef /server
parent8c9dbfd4a23dcb0617e3ace956ec29f670641afc (diff)
downloadhttpd-219b188e3439ca9bc5e2999d90667a12581668f5.tar.gz
On the 2.4.x branch:
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
Diffstat (limited to 'server')
-rw-r--r--server/mpm/winnt/child.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index cfa6098702..94a1438c60 100644
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -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);