Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1730683 - /httpd/httpd/branches/2.4.x/STATUS
Date: Tue, 16 Feb 2016 13:17:22 -0000
To: cvs@httpd.apache.org
From: jim@apache.org
Message-Id: <20160216131722.0BABA3A09F7@svn01-us-west.apache.org>

Author: jim
Date: Tue Feb 16 13:17:21 2016
New Revision: 1730683

URL: http://svn.apache.org/viewvc?rev=1730683&view=rev
Log:
promote


Modified:
    httpd/httpd/branches/2.4.x/STATUS

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1730683&r1=1730682&r2=1730683&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Feb 16 13:17:21 2016
@@ -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().