From: Daniel Earl Poirier <poirier@apache.org>
Date: Mon, 7 Feb 2011 18:07:22 +0000 (+0000)
Subject: Promote passed proposals
X-Git-Tag: 2.2.18~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=400f3d4f374247b91030d15948b30cd37833744a;p=thirdparty%2Fapache%2Fhttpd.git

Promote passed proposals

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

diff --git a/STATUS b/STATUS
index 1b73b13ed14..f595a22666b 100644
--- a/STATUS
+++ b/STATUS
@@ -116,6 +116,21 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
        Trunk version of patch works
      +1: rpluem, jorton, covener
 
+   * mod_userdir: support merge of "userdir disabled" or "userdir public_html"
+     when userdir directives appear in vhost context. PR 44076
+     Trunk patch: http://svn.apache.org/viewvc?rev=1042090&view=rev
+     2.2.x patch:  http://people.apache.org/~covener/patches/2.2.x-userdir_merge.diff 
+     +1 covener, rpluem, poirier
+
+  * mod_dav: If an unknown Content-* header is received for a PUT request, we
+    must not ignore it but reply with 501 per RFC 2616 9.6.
+    PR: 42978
+    Trunk version of patch:
+      http://svn.apache.org/viewvc?rev=1026746&view=rev
+    Backport version for 2.2.x of patch:
+      Trunk version of patch works
+    +1: rpluem, covener, poirier
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -207,12 +222,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.2.x patch: http://people.apache.org/~covener/patches/2.2.x-autoindex_merge.diff
      +1 covener, rpluem
 
-   * mod_userdir: support merge of "userdir disabled" or "userdir public_html"
-     when userdir directives appear in vhost context. PR 44076
-     Trunk patch: http://svn.apache.org/viewvc?rev=1042090&view=rev
-     2.2.x patch:  http://people.apache.org/~covener/patches/2.2.x-userdir_merge.diff 
-     +1 covener, rpluem, poirier
-
    * mod_proxy_http: Become aware of ssl handshake failures when attempting
      to pass request. Makes it so workers are put in error state when a
      handshake failure is encountered.
@@ -232,15 +241,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          Trunk version of patch works
       +1: rpluem,
 
-  * mod_dav: If an unknown Content-* header is received for a PUT request, we
-    must not ignore it but reply with 501 per RFC 2616 9.6.
-    PR: 42978
-    Trunk version of patch:
-      http://svn.apache.org/viewvc?rev=1026746&view=rev
-    Backport version for 2.2.x of patch:
-      Trunk version of patch works
-    +1: rpluem, covener, poirier
-
   * core: Add NoDecode option to AllowEncodedSlashes to turn off decoding
     of encoded slashes in path info.  (This is already the behavior of
     AllowEncodedSlashes On in trunk.)