promote

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

diff --git a/STATUS b/STATUS
index eee25bf9511c3300bb4a334877c11151c99c9263..fb6101a1f5e5049c3b294edd78bed350b64a0598 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -112,6 +112,14 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_remoteip: Prevent an external proxy from presenting an internal proxy
+     PR 55962.
+     Trunk version of patch:
+         http://svn.apache.org/r1588330
+     Trunk patch applies clean, modulo CHANGES
+     +1: wrowe, mrumph, jim
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -169,13 +177,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          <Plus docs>
      +1: jim
 
-  *) mod_remoteip: Prevent an external proxy from presenting an internal proxy
-     PR 55962.
-     Trunk version of patch:
-         http://svn.apache.org/r1588330
-     Trunk patch applies clean, modulo CHANGES
-     +1: wrowe, mrumph, jim
-
   *) core: Track the useragent_host per-request when mod_remoteip or similar
      modules track a per-request useragent_ip.  Modules should be updated
      to inquire for ap_get_useragent_host() in place of ap_get_remote_host().