From: Jim Jagielski <jim@apache.org>
Date: Thu, 9 Feb 2017 13:49:24 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.26~309
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=720065908fd372f5f83b31f1803f4e6953c1ef12;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index fe1ef1b23d3..a2002f18a92 100644
--- a/STATUS
+++ b/STATUS
@@ -127,7 +127,12 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-
+  *) mod_proxy: replace broken hunting for proxypass exceptions to location-based 
+                proxypass directives with "no-proxy" envvar. Fixes a regression in 2.4.25.
+     trunk patch: http://svn.apache.org/r1781324
+                  http://svn.apache.org/r1781328
+     2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-noproxy.diff
+     +1 covener, jim, jorton
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -201,13 +206,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works *after r1779573 above* (modulo CHANGES)
      +1: ylavic, jim
 
-  *) mod_proxy: replace broken hunting for proxypass exceptions to location-based 
-                proxypass directives with "no-proxy" envvar. Fixes a regression in 2.4.25.
-     trunk patch: http://svn.apache.org/r1781324
-                  http://svn.apache.org/r1781328
-     2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-noproxy.diff
-     +1 covener, jim, jorton
-
   *) PR 60576: 2.4.21 broke PHP-FPM with the patch to strip the bogus "proxy://"
      prefix from SCRIPT_FILENAME. We need to revert to the previous behavior
      ASAP to avoid any further hurdles with FCGI implementations while we figure