From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 3 Jun 2014 11:44:59 +0000 (+0000)
Subject: Promote.
X-Git-Tag: 2.4.10~169
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17c8d1c124321da14430e22422973fc626fd82fd;p=apache

Promote.

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

diff --git a/STATUS b/STATUS
index b4e291e2a9..64e947dcb5 100644
--- a/STATUS
+++ b/STATUS
@@ -100,6 +100,32 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * Easy patches - synch with trunk
+        mpm/event: fix whitespace in a debug message
+        mod_ext_filter: self document some apr_sleep usages
+        mod_rewrite: normalize an ugly construct which somehow manages to return the correct value
+        mod_header: This is annoying to see in a casual "LogLevel debug foo:traceX ..."
+        mod_proxy_http: Use 'apr_table_setn' instead of 'apr_table_set' when possible in order to save memory.
+        mod_proxy_scgi: Define default port for "scgi" schemes (as chosen by mod_proxy_scgi) in a common location.
+        mod_proxy_scgi: fix Doxygen markup error
+        util_expr_eval: Tweak a AP_DEBUG_ASSERT condition.
+        mod_auth_form: Add a debug message when the fields on a form are not recognised.
+        mod_auth_form: Make the trace logging consistent through the notes, session and form authentication steps.
+        mod_auth_form: update empty log tags.
+     trunk patch:
+                  http://svn.apache.org/r1546730
+                  http://svn.apache.org/r1583008
+                  http://svn.apache.org/r1571369
+                  http://svn.apache.org/r1552130
+                  http://svn.apache.org/r1578760
+                  http://svn.apache.org/r1592615
+                  http://svn.apache.org/r1592632
+                  http://svn.apache.org/r1595321
+                  http://svn.apache.org/r1550302
+                  http://svn.apache.org/r1550307
+                  http://svn.apache.org/r1585435
+     2.4.x patch:  http://people.apache.org/~jailletc36/backport7.patch
+     +1: jailletc36, jim, ylavic
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -199,33 +225,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works
      +1: ylavic, jim
 
-   * Easy patches - synch with trunk
-        mpm/event: fix whitespace in a debug message
-        mod_ext_filter: self document some apr_sleep usages
-        mod_rewrite: normalize an ugly construct which somehow manages to return the correct value
-        mod_header: This is annoying to see in a casual "LogLevel debug foo:traceX ..."
-        mod_proxy_http: Use 'apr_table_setn' instead of 'apr_table_set' when possible in order to save memory.
-        mod_proxy_scgi: Define default port for "scgi" schemes (as chosen by mod_proxy_scgi) in a common location.
-        mod_proxy_scgi: fix Doxygen markup error
-        util_expr_eval: Tweak a AP_DEBUG_ASSERT condition.
-        mod_auth_form: Add a debug message when the fields on a form are not recognised.
-        mod_auth_form: Make the trace logging consistent through the notes, session and form authentication steps.
-        mod_auth_form: update empty log tags.
-     trunk patch:
-                  http://svn.apache.org/r1546730
-                  http://svn.apache.org/r1583008
-                  http://svn.apache.org/r1571369
-                  http://svn.apache.org/r1552130
-                  http://svn.apache.org/r1578760
-                  http://svn.apache.org/r1592615
-                  http://svn.apache.org/r1592632
-                  http://svn.apache.org/r1595321
-                  http://svn.apache.org/r1550302
-                  http://svn.apache.org/r1550307
-                  http://svn.apache.org/r1585435
-     2.4.x patch:  http://people.apache.org/~jailletc36/backport7.patch
-     +1: jailletc36, jim
-
 
 OTHER PROPOSALS