Commit 89cbb819 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

when handling a graceful restart, kill the child using the correct handle 

to the pipe of death; otherwise the syscall fails


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88696 13f79535-47bb-0310-9956-ffa450edef68
parent 9f685ae7

server/mpm/threaded/threaded.c

+1 −1
Original line number Diff line number Diff line
@@ -1113,7 +1113,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) 


	/* give the children the signal to die */

        for (i = 0; i < ap_daemons_limit;) {

            if ((rv = apr_file_write(pipe_of_death_in, &char_of_death, &one)) != APR_SUCCESS) {

            if ((rv = apr_file_write(pipe_of_death_out, &char_of_death, &one)) != APR_SUCCESS) {

                if (APR_STATUS_IS_EINTR(rv)) continue;

                ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf, "write pipe_of_death");

            }