summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Covener <covener@apache.org>2016-12-29 18:27:12 +0000
committerEric Covener <covener@apache.org>2016-12-29 18:27:12 +0000
commit992b42a1fe0c0791ea690db7057439400d0910e7 (patch)
treea2c5f85fec9069d4ed2495e5b78436b3d65d6a55
parentc5f5760b7e0698c665019e8abbbbddb6e15239c5 (diff)
downloadhttpd-992b42a1fe0c0791ea690db7057439400d0910e7.tar.gz
mod_remoteip: Set useragent port to zero PR59931
When overriding the useragent address from X-Forwarded-For, zero out what had been initialized as the connection-level port. Submitted By: Hank Ibell <hwibell gmail.com> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1776458 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CHANGES4
-rw-r--r--modules/metadata/mod_remoteip.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 52f02efe33..1de27cba17 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
-*- coding: utf-8 -*-
Changes with Apache 2.5.0
+ *) mod_remoteip: When overriding the useragent address from X-Forwarded-For,
+ zero out what had been initialized as the connection-level port. PR59931.
+ [Hank Ibell <hwibell gmail.com>]
+
*) mod_proxy_wstunnel: Reliably run before mod_proxy_http.
[Eric Covener]
diff --git a/modules/metadata/mod_remoteip.c b/modules/metadata/mod_remoteip.c
index 28e01df297..06fc3f483b 100644
--- a/modules/metadata/mod_remoteip.c
+++ b/modules/metadata/mod_remoteip.c
@@ -394,6 +394,9 @@ static int remoteip_modify_request(request_rec *r)
return OK;
}
+ /* Port is not known so set it to zero; otherwise it can be misleading */
+ req->useragent_addr->port = 0;
+
req->proxied_remote = remote;
req->proxy_ips = proxy_ips;