Commit 7ea82100 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

The prefork MPM wasn't killing child processes correctly if a restart 

signal was received while the process was serving a request.  The child
process would become the equivalent of a second parent process.  If
we break out of the accept loop, then we need to do die after cleaning
up after ourselves.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87882 13f79535-47bb-0310-9956-ffa450edef68
parent 16bac49b

CHANGES

+6 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0b1



  *) The prefork MPM wasn't killing child processes correctly if a restart

     signal was received while the process was serving a request.  The child

     process would become the equivalent of a second parent process.  If

     we break out of the accept loop, then we need to do die after cleaning

     up after ourselves.  [Ryan Bloom]



  *) Change the Prefork MPM to use SIGWINCH instead of SIGUSR1 for graceful

     restarts.  [Ryan Bloom]

server/mpm/prefork/prefork.c

+1 −0
Original line number Diff line number Diff line
@@ -1052,6 +1052,7 @@ static void child_main(int child_num_arg) 
	ap_process_connection(current_conn);

        ap_lingering_close(current_conn);

    }

    clean_child_exit(0);

}