httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1741461 - /httpd/httpd/trunk/server/scoreboard.c
Date Thu, 28 Apr 2016 15:37:49 GMT
Author: wrowe
Date: Thu Apr 28 15:37:49 2016
New Revision: 1741461

URL: http://svn.apache.org/viewvc?rev=1741461&view=rev
Log:
Revert to 2.4.1 behavior and null the request and vhost as appropriate. PR 59333

Modified:
    httpd/httpd/trunk/server/scoreboard.c

Modified: httpd/httpd/trunk/server/scoreboard.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/scoreboard.c?rev=1741461&r1=1741460&r2=1741461&view=diff
==============================================================================
--- httpd/httpd/trunk/server/scoreboard.c (original)
+++ httpd/httpd/trunk/server/scoreboard.c Thu Apr 28 15:37:49 2016
@@ -500,6 +500,9 @@ static int update_child_status_internal(
         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(
                 apr_cpystrn(ws->vhost, s->server_hostname, sizeof(ws->vhost));
             }
         }
+        else if (c) {
+            ws->vhost[0]='\0';
+        }
 
         if (c) {
             val = ap_get_protocol(c);



Mime
View raw message