From af8355ac8703fadcf239778da2a479894932ce07 Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Fri, 21 Apr 2017 14:08:31 +0000 Subject: [PATCH] On the 2.4.x branch: Merged /httpd/httpd/trunk:r1790973,1790978 mpm_winnt: always invoke ap_lingering_close() at connection end as in all other mpm modules, giving everyone a chance to cleanup at prep lingering close hook. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1792211 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 8 -------- server/mpm/winnt/child.c | 6 ++---- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/STATUS b/STATUS index 2bc157b5c8..266695f8bc 100644 --- a/STATUS +++ b/STATUS @@ -145,14 +145,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) mpm_winnt: always invoke ap_lingering_close() at connection end as in - all other mpm modules, giving everyone a chance to cleanup at prep - lingering close hook. - trunk patch: http://svn.apache.org/r1790973 - trunk patch: http://svn.apache.org/r1790978 - 2.4.x patch: trunk works - +1: icing, steffen, jim (inspection) - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c index 94a1438c60..ec8c5a2679 100644 --- a/server/mpm/winnt/child.c +++ b/server/mpm/winnt/child.c @@ -813,13 +813,11 @@ static DWORD __stdcall worker_main(void *thread_num_val) ap_process_connection(c, context->sock); - apr_socket_opt_get(context->sock, APR_SO_DISCONNECTED, &disconnected); + ap_lingering_close(c); + apr_socket_opt_get(context->sock, APR_SO_DISCONNECTED, &disconnected); if (!disconnected) { context->accept_socket = INVALID_SOCKET; - if (!c->aborted) { - ap_lingering_close(c); - } } } -- 2.40.0