From: Jim Jagielski <jim@apache.org>
Date: Wed, 30 Sep 2015 13:30:10 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.17~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8c4f0dac9b352454594fac92d85173aae45bad3;p=thirdparty%2Fapache%2Fhttpd.git

promote



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

diff --git a/STATUS b/STATUS
index 684f0d5a22f..afc7093ec4d 100644
--- a/STATUS
+++ b/STATUS
@@ -110,6 +110,12 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_proxy: Fix ProxySourceAddress binding failure with AH00938.  PR 56687.
+     trunk patch: http://svn.apache.org/r1703902
+     2.4.x patch: trunk works (module CHANGES)
+     +1: ylavic, minfrin, jim
+
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -187,12 +193,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      ylavic: while at it, I also included r1678763 which is only an
              optimization, but allows to keep code in sync with trunk.
 
-  *) mod_proxy: Fix ProxySourceAddress binding failure with AH00938.  PR 56687.
-     trunk patch: http://svn.apache.org/r1703902
-     2.4.x patch: trunk works (module CHANGES)
-     +1: ylavic, minfrin, jim
-
-
   *) mod_alias: Introduce expression parser support for Alias, ScriptAlias
      and Redirect. Limit Redirect expressions to directory (Location) context
      and redirect statuses (implicit or explicit).