From: Rainer Jung <rjung@apache.org>
Date: Sun, 8 May 2016 10:09:17 +0000 (+0000)
Subject: Don't globber scoreboard request info if
X-Git-Tag: 2.5.0-alpha~1639
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d6e351525b0de301765b55772f6d2b128354f7a;p=thirdparty%2Fapache%2Fhttpd.git

Don't globber scoreboard request info if
read_request_line() fails with a timeout.
In that case there's no new useful request
info available.

Noticed via server-status showing request
"NULL" after keep-alive connections timed out.


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

diff --git a/server/protocol.c b/server/protocol.c
index b4c149f367a..3c160353d8c 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -1099,7 +1099,7 @@ request_rec *ap_read_request(conn_rec *conn)
             apr_brigade_destroy(tmp_bb);
             goto traceout;
         case HTTP_REQUEST_TIME_OUT:
-            ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r);
+            ap_update_child_status_from_conn(conn->sbh, SERVER_BUSY_LOG, conn);
             if (!r->connection->keepalives)
                 ap_run_log_transaction(r);
             apr_brigade_destroy(tmp_bb);