From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 12 May 2016 15:11:21 +0000 (+0000)
Subject: Don't globber scoreboard request info if read_request_line() fails with
X-Git-Tag: 2.4.21~181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dab73da87db384827f8acea08084a40579539d85;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/STATUS b/STATUS
index 0da59d96d2f..0035d34ee77 100644
--- a/STATUS
+++ b/STATUS
@@ -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 ]
diff --git a/server/protocol.c b/server/protocol.c
index 817cd3e1267..88d0f992517 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -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);
             }