From: Jim Jagielski <jim@apache.org>
Date: Mon, 29 Aug 2011 15:21:31 +0000 (+0000)
Subject: And promote
X-Git-Tag: 2.2.20~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43aafa50e986f48fc8dc0496e560981bebec0464;p=thirdparty%2Fapache%2Fhttpd.git

And promote


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

diff --git a/STATUS b/STATUS
index e9f472e678b..ae0564b7ebf 100644
--- a/STATUS
+++ b/STATUS
@@ -92,6 +92,23 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * mod_deflate: Stop compressing HEAD requests if there is not Content-Length
+    header
+    Trunk patch: http://svn.apache.org/viewvc?rev=958253&view=rev
+    2.2.x patch: trunk patch works with offset
+    +1: sf, covener, jim
+
+  * mod_reqtimeout: Disable keep-alive after read timeout
+    Trunk patch: http://svn.apache.org/viewvc?rev=1103213&view=rev
+    2.2.x patch: trunk patch works except for CHANGES
+    +1: sf, covener, jim
+
+  * mod_authnz_ldap: Treat 'constraint violation' as auth denied, not as
+    internal server error.
+    Trunk patch: http://svn.apache.org/viewvc?rev=1125646&view=rev
+    2.2.x patch: trunk patch works except for CHANGES
+    +1: sf, covener, jim
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -118,23 +135,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                 In that case, there is a log message with level error, but
                 that is not the one I want to change.
 
-  * mod_deflate: Stop compressing HEAD requests if there is not Content-Length
-    header
-    Trunk patch: http://svn.apache.org/viewvc?rev=958253&view=rev
-    2.2.x patch: trunk patch works with offset
-    +1: sf, covener, jim
-
-  * mod_reqtimeout: Disable keep-alive after read timeout
-    Trunk patch: http://svn.apache.org/viewvc?rev=1103213&view=rev
-    2.2.x patch: trunk patch works except for CHANGES
-    +1: sf, covener, jim
-
-  * mod_authnz_ldap: Treat 'constraint violation' as auth denied, not as
-    internal server error.
-    Trunk patch: http://svn.apache.org/viewvc?rev=1125646&view=rev
-    2.2.x patch: trunk patch works except for CHANGES
-    +1: sf, covener, jim
-
   * mod_filter: fix parsing of regexps containing slashes
     PR 51434 (and 51435, which includes the fix)
     Trunk patch: N/A