From: Stefan Eissing <icing@apache.org>
Date: Wed, 6 Jun 2018 10:32:41 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.34~112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d4e2103565fd4336834bc3a4f4705ff61957e09;p=apache

promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833000 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 30a6701276..2de93e1232 100644
--- a/STATUS
+++ b/STATUS
@@ -151,6 +151,13 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
                   (trunk works modulo CHANGES))
      +1: ylavic, jim, icing
 
+  *) mod_remoteip: When overriding the useragent address from X-Forwarded-For,
+     zero out what had been initialized as the connection-level port.  PR59931.
+     trunk patch: http://svn.apache.org/r1776458
+     2.4.x patch: trunk works (module CHANGES)
+                  svn merge -c 1776458 ^/httpd/httpd/trunk
+     +1: ylavic, covener, icing
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -213,13 +220,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      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.
-     trunk patch: http://svn.apache.org/r1776458
-     2.4.x patch: trunk works (module CHANGES)
-                  svn merge -c 1776458 ^/httpd/httpd/trunk
-     +1: ylavic, covener, icing
-
   *) mod_proxy: Fix a corner case where the ProxyPassReverseCookieDomain or
      ProxyPassReverseCookiePath directive could fail to update correctly 
      'domain=' or 'path=' in the 'Set-Cookie' header.  PR 61560.