summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Eissing <icing@apache.org>2017-04-11 13:41:44 +0000
committerStefan Eissing <icing@apache.org>2017-04-11 13:41:44 +0000
commit354e89a57e27909148b6cea84653fb0c9eab6db4 (patch)
tree4d9da6a51a75f363a0bded069bf44a00eb178831
parente2afe4d2e2085c198bd1877e0b22eae08019140b (diff)
downloadhttpd-354e89a57e27909148b6cea84653fb0c9eab6db4.tar.gz
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
-rw-r--r--server/mpm/winnt/child.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index 6f9625b421..45b22a0d34 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);