From: Jim Jagielski <jim@apache.org>
Date: Tue, 2 Jun 2015 13:38:25 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.13~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88fef22cb33bd252f92855ff13e2b0fe9e380191;p=apache

promote



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

diff --git a/STATUS b/STATUS
index 3ccc7244b8..552eeb4a07 100644
--- a/STATUS
+++ b/STATUS
@@ -105,6 +105,28 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_proxy: Don't put the worker in error state for 500 or 503 errors
+     returned by the backend unless failonstatus is configured to.  PR 56925.
+     trunk patch: http://svn.apache.org/r1681694
+     trunk patch: http://svn.apache.org/r1682907
+     2.4.x patch: trunk works (modulo CHANGES)
+     +1: ylavic, rjung, jim
+
+   *) Easy patches - synch with trunk
+        - mod_rewrite: Initialize args to not print garbage mem during a RewriteCond parse error
+        - mod_rewrite: Initialize args to not print garbage mem during a RewriteRule parse error
+        - examples/mod_*: Improve style in examples.
+        - proxy_util: Improve error message
+        - mod_proxy_wstunnel: Concat string at compile time in orser to save a few cycles.
+     trunk patch:
+        http://svn.apache.org/r1681795
+        http://svn.apache.org/r1682988
+        http://svn.apache.org/r1682979
+        http://svn.apache.org/r1682819
+        http://svn.apache.org/r1682816
+     2.4.x patch: trunk patchs work
+     +1: jailletc36, ylavic, jim
+
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -211,28 +233,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      ylavic: we'd better comment on @dev for this one for Stefan Eissing (who
              proposed the merge) to be able to follow (and comment too).
 
-  *) mod_proxy: Don't put the worker in error state for 500 or 503 errors
-     returned by the backend unless failonstatus is configured to.  PR 56925.
-     trunk patch: http://svn.apache.org/r1681694
-     trunk patch: http://svn.apache.org/r1682907
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: ylavic, rjung, jim
-
-   *) Easy patches - synch with trunk
-        - mod_rewrite: Initialize args to not print garbage mem during a RewriteCond parse error
-        - mod_rewrite: Initialize args to not print garbage mem during a RewriteRule parse error
-        - examples/mod_*: Improve style in examples.
-        - proxy_util: Improve error message
-        - mod_proxy_wstunnel: Concat string at compile time in orser to save a few cycles.
-     trunk patch:
-        http://svn.apache.org/r1681795
-        http://svn.apache.org/r1682988
-        http://svn.apache.org/r1682979
-        http://svn.apache.org/r1682819
-        http://svn.apache.org/r1682816
-     2.4.x patch: trunk patchs work
-     +1: jailletc36, ylavic, jim
-
 PATCHES/ISSUES THAT ARE BEING WORKED
 
    * mod_proxy_http: Don't establish or reuse a backend connection before pre-