From 16c0aafd9e0496eeec11b9cabf40cba4f2e748fc Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Wed, 6 Jun 2018 10:04:24 +0000 Subject: [PATCH] Agree with Stefan (clearing Christophe's vote). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832997 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/STATUS b/STATUS index 9e41d3c1a1..1827468dee 100644 --- a/STATUS +++ b/STATUS @@ -208,12 +208,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: maintainer mode with gcc 8.1.0 trunk patch: http://svn.apache.org/r1831231 http://svn.apache.org/r1831591 - 2.4.x patch: svn merge -c 1831231,1831591 ^/httpd/httpd/trunk . - +1: jailletc36, ylavic, - -1: icing - this needs to be svn merge -c 1831231,1831591,1832934,1832937 ^/httpd/httpd/trunk . - as the orignal "gcc warnings" fix broke link header mapping, - with that: +1 + http://svn.apache.org/r1832934 + http://svn.apache.org/r1832937 + 2.4.x patch: svn merge -c 1831231,1831591,1832934,1832937 ^/httpd/httpd/trunk . + +1: ylavic, icing *) mod_remoteip: When overriding the useragent address from X-Forwarded-For, zero out what had been initialized as the connection-level port. PR59931. -- 2.40.0