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 b4c149f367a437130a728142d76b590aa9e0e8e9..3c160353d8c63311f630ef21151c5de5f69a433b 100644 (file)
--- 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);