Commit 3f874e8d authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1766160 from trunk: 

mpm_unix: Apache fails to start if previously crashed then restarted with
the same PID (e.g. in container).  PR 60261.

Proposed by: Val <valentin.bremond gmail.com>
Reviewed by: ylavic

Submitted by: ylavic
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1768078 13f79535-47bb-0310-9956-ffa450edef68
parent 3c55bae1

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 


Changes with Apache 2.4.24



  *) mpm_unix: Apache fails to start if previously crashed then restarted with

     the same PID (e.g. in container).  PR 60261.

     [Val <valentin.bremond gmail.com>, Yann Ylavic]



  *) mod_http2: unannounced and multiple interim responses (status code < 200)

     are parsed and forwarded to client until a final response arrives.

     [Stefan Eissing]

STATUS

+0 −6
Original line number Diff line number Diff line
@@ -117,12 +117,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) mpm_unix: Apache fails to start if previously crashed then restarted with

     the same PID (e.g. in container).  PR 60261.

     trunk patch: http://svn.apache.org/r1766160

     2.4.x patch: trunk works (modulo CHANGES)

     +1: ylavic, jim, covener



  *) http: Respond with "408 Request Timeout" when a timeout occurs while

     reading the request body.  PR 60313.

     trunk patch: http://svn.apache.org/r1739201

server/mpm_unix.c

+4 −1
Original line number Diff line number Diff line
@@ -787,7 +787,10 @@ int ap_signal_server(int *exit_status, apr_pool_t *pconf) 
        status = "httpd (no pid file) not running";

    }

    else {

        if (kill(otherpid, 0) == 0) {

        /* With containerization, httpd may get the same PID at each startup,

         * handle it as if it were not running (it obviously can't).

         */

        if (otherpid != getpid() && kill(otherpid, 0) == 0) {

            running = 1;

            status = apr_psprintf(pconf,

                                  "httpd (pid %" APR_PID_T_FMT ") already "