From: Jim Jagielski <jim@apache.org>
Date: Mon, 17 Feb 2014 14:11:10 +0000 (+0000)
Subject: Merge r1564475 from trunk:
X-Git-Tag: 2.4.8~111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e74e88bad5db28643105b3b7b318175289f682da;p=apache

Merge r1564475 from trunk:

Use the correct IP addresses to populate the proxy_ips field
in mod_remoteip.c.  PR 55972.

Submitted by: mrumph
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1569003 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 96f77a0ca2..bce9064194 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.8
 
+  *) mod_remoteip: Use the correct IP addresses to populate the proxy_ips field.
+     PR 55972. [Mike Rumph]
+
   *) mod_lua: Fix r:setcookie() to add, rather than replace,
      the Set-Cookie header. PR56105
      [Kevin J Walters <kjw ms com>, Edward Lu <Chaosed0 gmail com>]
diff --git a/STATUS b/STATUS
index 0da1daf1ce..6a36087a25 100644
--- a/STATUS
+++ b/STATUS
@@ -98,12 +98,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_remoteip: Use the correct IP addresses to populate the proxy_ips field.
-                   PR55972
-     trunk patch: https://svn.apache.org/r1564475
-     2.4.x patch: trunk works
-     +1: mrumph, jim, covener
-
    * mod_ssl: enable auto curve selection for ECDHE / OpenSSL 1.0.2
      trunk patch: https://svn.apache.org/r1563420
      2.4.x patch: trunk patch works
diff --git a/modules/metadata/mod_remoteip.c b/modules/metadata/mod_remoteip.c
index 1926066119..029d8226c3 100644
--- a/modules/metadata/mod_remoteip.c
+++ b/modules/metadata/mod_remoteip.c
@@ -352,16 +352,17 @@ static int remoteip_modify_request(request_rec *r)
         /* save away our results */
         if (!req) {
             req = (remoteip_req_t *) apr_palloc(r->pool, sizeof(remoteip_req_t));
+            req->useragent_ip = r->useragent_ip;
         }
 
         /* Set useragent_ip string */
         if (!internal) {
             if (proxy_ips) {
                 proxy_ips = apr_pstrcat(r->pool, proxy_ips, ", ",
-                                        c->client_ip, NULL);
+                                        req->useragent_ip, NULL);
             }
             else {
-                proxy_ips = c->client_ip;
+                proxy_ips = req->useragent_ip;
             }
         }