From: Yann Ylavic Date: Wed, 6 Jun 2018 10:56:19 +0000 (+0000) Subject: Merge r1776458 from trunk: X-Git-Tag: 2.4.34~109 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42fc1e75b99b27d9474949c7138cba49af512ff3;p=apache Merge r1776458 from trunk: 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 Reviewed by: ylavic, covener, icing git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833007 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index b9bbc876b9..ca1132c5b7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,10 @@ -*- coding: utf-8 -*- Changes with Apache 2.4.34 + *) 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 ] + *) core: In ONE_PROCESS/debug mode, cleanup everything when exiting. [Yann Ylavic] diff --git a/modules/metadata/mod_remoteip.c b/modules/metadata/mod_remoteip.c index e67ff3655f..d4f710425e 100644 --- a/modules/metadata/mod_remoteip.c +++ b/modules/metadata/mod_remoteip.c @@ -727,6 +727,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;