Commit 99590f6f authored by Yann Ylavic's avatar Yann Ylavic
Browse files

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 <hwibell gmail.com>
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
parent 4518df8b

CHANGES

+4 −0
Original line number Diff line number Diff line 
                                                         -*- 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 <hwibell gmail.com>]



  *) core: In ONE_PROCESS/debug mode, cleanup everything when exiting.

     [Yann Ylavic]

modules/metadata/mod_remoteip.c

+3 −0
Original line number Diff line number Diff line
@@ -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;