Commit e515e262 authored by Stefan Eissing's avatar Stefan Eissing
Browse files

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
parent 75e1e0cb

STATUS

+0 −8
Original line number Diff line number Diff line
@@ -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 ]

server/mpm/winnt/child.c

+2 −4
Original line number Diff line number Diff line
@@ -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);

            }

        }

    }