From: Eric Covener <covener@apache.org>
Date: Thu, 23 May 2013 13:38:34 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.5~247
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a3eeea8158254b23e5e1567724ff7d79206a0f5;p=apache

promote


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

diff --git a/STATUS b/STATUS
index 24bc7727be..391409102d 100644
--- a/STATUS
+++ b/STATUS
@@ -90,6 +90,16 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+    * mod_dav: Ensure URI is correctly uriencoded on return. PR 54611
+      trunk patch: http://svn.apache.org/r1476621
+      2.4.x patch: trunk patch works (minus CHANGES)
+      +1: minfrin, jim, covener
+
+    * core: speed up (for common cases) and reduce memory usage of ap_escape_logitem
+      This should save 70-100 bytes in the request pool for a default config.
+      trunk patch: http://svn.apache.org/r1485409
+      2.4.x patch: trunk works
+      +1: jailletc36, jim, covener
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -192,11 +202,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: trunk patch works (minus CHANGES)
       +1: minfrin, jim
 
-    * mod_dav: Ensure URI is correctly uriencoded on return. PR 54611
-      trunk patch: http://svn.apache.org/r1476621
-      2.4.x patch: trunk patch works (minus CHANGES)
-      +1: minfrin, jim, covener
-
     * mod_dav: PROPPATCH delete (svn propdel) silently discards errors.
       PR 53525
       trunk patch: http://svn.apache.org/r1476627
@@ -348,12 +353,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: trunk works, modulo CHANGES
       +1: minfrin
 
-    * core: speed up (for common cases) and reduce memory usage of ap_escape_logitem
-      This should save 70-100 bytes in the request pool for a default config.
-      trunk patch: http://svn.apache.org/r1485409
-      2.4.x patch: trunk works
-      +1: jailletc36, jim, covener
-
     * mod_dav: Sending a MERGE request against a URI handled by mod_dav_svn with
       the source href (sent as part of the request body as XML) pointing to a
       URI that is not configured for DAV will trigger a segfault.