]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Revert to 2.4.1 behavior and null the request and vhost as appropriate. PR 59333
authorWilliam A. Rowe Jr <wrowe@apache.org>
Thu, 28 Apr 2016 15:37:49 +0000 (15:37 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Thu, 28 Apr 2016 15:37:49 +0000 (15:37 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1741461 13f79535-47bb-0310-9956-ffa450edef68

server/scoreboard.c

index 10128c03344adf29552d7188744844e4ac66f5b7..36fe995cbe45f4d9cefdb37445b63794666fefdc 100644 (file)
@@ -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);