From: William A. Rowe Jr <wrowe@apache.org>
Date: Mon, 29 Aug 2005 20:22:19 +0000 (+0000)
Subject:   Accepted, lingering swaps
X-Git-Tag: 2.0.55~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48f5bc4158ea41e38740ae5042854e5fe26ed8e0;p=thirdparty%2Fapache%2Fhttpd.git

  Accepted, lingering swaps

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

diff --git a/STATUS b/STATUS
index e2e88bf0275..1eafb803800 100644
--- a/STATUS
+++ b/STATUS
@@ -189,16 +189,32 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       http://svn.apache.org/viewcvs?view=rev&rev=154319
       +1: stoddard, striker, wrowe (as corrected in subsequent patches)
 
-    * mod_version: New Module, Backport from trunk. Requires Minor MMN Bump.
-      http://svn.apache.org/repos/asf/httpd/httpd/branches/mod_version_for_2.0.x
-      +1: pquerna, nd
-      Votes from before the integration branch:
-          +1: jerenkrantz, wrowe (trivial, would even be cool in 1.3)
-
     *) Add httxt2dbm for creating RewriteMap DBM Files.
        http://svn.apache.org/viewcvs.cgi?rev=209539&view=rev
        +1: pquerna, jorton, trawick
 
+    *) Remove the base href tag from mod_proxy_ftp, as it breaks relative
+       links for clients not using an Authorization header.
+         modules/proxy/mod_proxy_ftp.c: r231044
+       +1: minfrin, jim, nd
+
+    *) mod_include: Fix possible variable corruption with nested
+       includes.
+         http://svn.apache.org/viewcvs?rev=179763&view=rev
+       2.0.x patch: http://people.apache.org/~jorton/ap_pr12655.patch
+       test case in perl-framework/t/modules/include.t
+       PR: 12655
+       +1: jorton, nd, jerenkrantz
+
+    *) mod_auth_digest: Fix hostinfo validation for CONNECT requests.
+         http://svn.apache.org/viewcvs.cgi?rev=193127&view=rev
+       +1: jorton, nd, jerenkrantz
+
+    *) mod_version: New Module, Backport from trunk. Requires Minor MMN Bump.
+       http://svn.apache.org/repos/asf/httpd/httpd/branches/mod_version_for_2.0.x
+       +1: pquerna, nd, wrowe
+       Votes from before the integration branch: +1: jerenkrantz
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to
@@ -211,11 +227,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        test case: perl-framework/t/security/CAN-2005-2491.t
        +1: jorton, nd
 
-    *) Remove the base href tag from mod_proxy_ftp, as it breaks relative
-       links for clients not using an Authorization header.
-         modules/proxy/mod_proxy_ftp.c: r231044
-       +1: minfrin, jim, nd
-
     *) Correct RFC 2616 non-compliance by refusing to proxy a request body 
        in a TRACE request, unless TraceEnable extended is configured.
        Introduces TraceEnable [on|off|extended] to give the administrator
@@ -298,18 +309,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         PR: 35279
         +1: jorton, jerenkrantz
 
-     *) mod_include: Fix possible variable corruption with nested
-        includes.
-        http://svn.apache.org/viewcvs?rev=179763&view=rev
-        2.0.x patch: http://people.apache.org/~jorton/ap_pr12655.patch
-        test case in perl-framework/t/modules/include.t
-        PR: 12655
-        +1: jorton, nd, jerenkrantz
-
-     *) mod_auth_digest: Fix hostinfo validation for CONNECT requests.
-        http://svn.apache.org/viewcvs.cgi?rev=193127&view=rev
-        +1: jorton, nd, jerenkrantz
-
      *) Reverse Proxy fixes: <Location> bug and Cookie support
         Patch is at
         http://marc.theaimsgroup.com/?l=apache-httpd-dev&m=112365629308138&q=p4
@@ -320,6 +319,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                        If so, what revision?  And, is there a clean patch for
                        2.0?  (The patch in that message isn't clean.)
 
+
 PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:
 
     *) Remove LDAP toolkit specific code from util_ldap and mod_auth_ldap.