From: Mike Rumph <mrumph@apache.org>
Date: Tue, 4 Feb 2014 20:38:01 +0000 (+0000)
Subject: Use the correct IP addresses to populate the proxy_ips field
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a60d5d910cdd806b0c25968214dc3282e227e41;p=thirdparty%2Fapache%2Fhttpd.git

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


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

diff --git a/CHANGES b/CHANGES
index 6329fc201e4..9ca834388c5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_remoteip: Use the correct IP addresses to populate the proxy_ips field.
+     PR 55972. [Mike Rumph]
+
   *) mod_proxy: Do not try to parse the regular expressions passed by
      ProxyPassMatch as URL as they do not follow their syntax.
      PR 56074. [Ruediger Pluem]
diff --git a/modules/metadata/mod_remoteip.c b/modules/metadata/mod_remoteip.c
index 079fb1f17dc..61087590ec7 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;
             }
         }