From: Eric Covener <covener@apache.org>
Date: Mon, 17 Jan 2011 23:10:16 +0000 (+0000)
Subject: promote two approved backports
X-Git-Tag: 2.2.18~182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5da644d0e206e80ba7ad4ec7b8672081241317c;p=thirdparty%2Fapache%2Fhttpd.git

promote two approved backports


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

diff --git a/STATUS b/STATUS
index a09ab752930..5ea05a8d596 100644
--- a/STATUS
+++ b/STATUS
@@ -98,6 +98,24 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.2.x patch: http://people.apache.org/~minfrin/httpd-mod_cache-304-fix-2.patch
      +1: minfrin, jim, covener
 
+   * core: honor "AcceptPathInfo OFF" for internal redirects, such as those
+     generated by mod_rewrite in per-dir context.  This would be left floating
+     around in the request_rec with a pcalloc'ed value, so the core fixup
+     hook thought some module had overridden it. PR 50349.
+     Trunk patch: http://svn.apache.org/viewvc?rev=1043023&view=rev
+     2.2.x patch: http://people.apache.org/~covener/patches/2.2.x-accept_pathinfo_redir.diff
+    +1 covener, rpluem, jorton
+
+   * mod_dav: If a malformed Content-Range header is received for a PUT request,
+     we must not use the supplied content per RFC 2616 14.16. Send 400 response
+     instead of ignoring the Content-Range.
+     PR: 49825
+     Trunk version of patch:
+       http://svn.apache.org/viewvc?rev=1026743&view=rev
+     Backport version for 2.2.x of patch:
+       Trunk version of patch works
+     +1: rpluem, jorton, covener
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -188,14 +206,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.2.x patch:  http://people.apache.org/~covener/patches/2.2.x-userdir_merge.diff 
      +1 covener, rpluem
 
-   * core: honor "AcceptPathInfo OFF" for internal redirects, such as those
-     generated by mod_rewrite in per-dir context.  This would be left floating
-     around in the request_rec with a pcalloc'ed value, so the core fixup
-     hook thought some module had overridden it. PR 50349.
-     Trunk patch: http://svn.apache.org/viewvc?rev=1043023&view=rev
-     2.2.x patch: http://people.apache.org/~covener/patches/2.2.x-accept_pathinfo_redir.diff
-    +1 covener, rpluem, jorton
-
    * 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.
@@ -224,15 +234,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       Trunk version of patch works
     +1: rpluem, covener
 
-  * mod_dav: If a malformed Content-Range header is received for a PUT request,
-    we must not use the supplied content per RFC 2616 14.16. Send 400 response
-    instead of ignoring the Content-Range.
-    PR: 49825
-    Trunk version of patch:
-      http://svn.apache.org/viewvc?rev=1026743&view=rev
-    Backport version for 2.2.x of patch:
-      Trunk version of patch works
-    +1: rpluem, jorton, covener
 
 PATCHES/ISSUES THAT ARE STALLED