summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorStefan Eissing <icing@apache.org>2017-04-11 13:36:27 +0000
committerStefan Eissing <icing@apache.org>2017-04-11 13:36:27 +0000
commit8c9dbfd4a23dcb0617e3ace956ec29f670641afc (patch)
tree19911ee183c33d2ca551244717696a0a93d8163e /server
parentd25dd7050e35b11fe4c07233a53f300caa09e9f0 (diff)
downloadhttpd-8c9dbfd4a23dcb0617e3ace956ec29f670641afc.tar.gz
On the trunk:
mpm_winnt: always invoking ap_lingering_close() at connection end. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1790971 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
-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 94a1438c60..cfa6098702 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);