From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 28 Apr 2016 15:37:49 +0000 (+0000)
Subject: Revert to 2.4.1 behavior and null the request and vhost as appropriate. PR 59333
X-Git-Tag: 2.5.0-alpha~1685
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4ff39c9b6566d5f74066add1e20f2534682300e;p=thirdparty%2Fapache%2Fhttpd.git

Revert to 2.4.1 behavior and null the request and vhost as appropriate. PR 59333

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

diff --git a/server/scoreboard.c b/server/scoreboard.c
index 10128c03344..36fe995cbe4 100644
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -500,6 +500,9 @@ static int update_child_status_internal(int child_num,
         else if (r) {
             copy_request(ws->request, sizeof(ws->request), r);
         }
+        else if (c) {
+            ws->request[0]='\0';
+        }
 
         if (r && r->useragent_ip) {
             if (!(val = ap_get_useragent_host(r, REMOTE_NOLOOKUP, NULL)))
@@ -524,6 +527,9 @@ static int update_child_status_internal(int child_num,
                 apr_cpystrn(ws->vhost, s->server_hostname, sizeof(ws->vhost));
             }
         }
+        else if (c) {
+            ws->vhost[0]='\0';
+        }
 
         if (c) {
             val = ap_get_protocol(c);