Commit 91c370ea authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

Don't globber scoreboard request info if read_request_line() fails with 

a timeout. In that case there's not yet any new useful request info
available.
Noticed via server-status for prefork showing request "NULL" after
keep-alive connections timed out.

PR: 59333.
Backports: 1742792
Submitted by: rjung
Reviewed by: ylavic, wrowe


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

STATUS

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

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



   * Don't globber scoreboard request info if read_request_line() fails with

     a timeout. In that case there's not yet any new useful request info

     available.

     Noticed via server-status for prefork showing request "NULL" after

     keep-alive connections timed out.

     No CHANGES entry needed, because there's already one for PR 59333.

     Sorry for the three patches. The first one is overwritten by the second

     one, so technically only the second is needed, but merging both keeps

     the mergeinfo more complete.

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

                  http://svn.apache.org/r1742792

     2.4.x patch: trunk works

     +1: rjung, ylavic, wrowe





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

server/protocol.c

+1 −1
Original line number Diff line number Diff line
@@ -992,7 +992,7 @@ request_rec *ap_read_request(conn_rec *conn) 
            goto traceout;

        }

        else if (r->status == HTTP_REQUEST_TIME_OUT) {

            ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r);

            ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, NULL);

            if (!r->connection->keepalives) {

                ap_run_log_transaction(r);

            }