]> granicus.if.org Git - apache/commit
A rather ugly patch since the code was refactored recently to exclude
authorWilliam A. Rowe Jr <wrowe@apache.org>
Fri, 12 Feb 2016 01:19:49 +0000 (01:19 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Fri, 12 Feb 2016 01:19:49 +0000 (01:19 +0000)
commit0ebed1b38e5a620c2f9c0884bb7d5734944b79a0
tree1d6d264f4e5f6a22849d2a3cc908d24740e1b827
parent690c6105f9e66cb3a8a8b03344f64b2cf00d83e9
A rather ugly patch since the code was refactored recently to exclude
the simple patch for 2.4.x, illustrated below.

Completes the changeset r1729930 and resolves all 2.4.19-dev corrections,
but other 2.5.0-dev specific changes may still be needed on trunk.

--- server/scoreboard.c (revision 1729907)
+++ server/scoreboard.c (working copy)
@@ -491,9 +491,8 @@
             ws->conn_bytes = 0;
         }
         if (r) {
-            const char *client = ap_get_remote_host(c, r->per_dir_config,
-                                 REMOTE_NOLOOKUP, NULL);
-            if (!client || !strcmp(client, c->client_ip)) {
+            const char *client;
+            if (!(client = ap_get_useragent_host(r, REMOTE_NOLOOKUP, NULL))) {
                 apr_cpystrn(ws->client, r->useragent_ip, sizeof(ws->client));
             }
             else {

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