From: Ruediger Pluem <rpluem@apache.org>
Date: Fri, 21 Oct 2005 22:48:18 +0000 (+0000)
Subject: * Move two backports from proposed to accepted, as they have enough votes now.
X-Git-Tag: 2.0.56~146
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a237b7edbc78a2d123444ad3b746e67f3882a38b;p=thirdparty%2Fapache%2Fhttpd.git

* Move two backports from proposed to accepted, as they have enough votes now.


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

diff --git a/STATUS b/STATUS
index 4b4fbbc4211..f22dbf66fda 100644
--- a/STATUS
+++ b/STATUS
@@ -147,6 +147,16 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
          modules/proxy/mod_proxy_ftp.c: r231044
        +1: minfrin, jim, nd
 
+    *) Add missing va_end call
+         http://svn.apache.org/viewcvs?rev=321500&view=rev
+       +1: nd, trawick, colm
+
+    *) mod_cache: Fix handling of 'Vary: *". PR 16125.
+       Trunk: r180341
+       2.0.x Patch: http://issues.apache.org/bugzilla/attachment.cgi?id=15297
+       +1: pquerna, jerenkrantz, colm
+       jerenkrantz notes: I do prefer the version from r190033 (own if check).
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to
@@ -215,12 +225,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         +1: trawick, wrowe
          backported 280114 to 2.2.x branch already
 
-     *) mod_cache: Fix handling of 'Vary: *". PR 16125.
-        Trunk: r180341
-        2.0.x Patch: http://issues.apache.org/bugzilla/attachment.cgi?id=15297
-        +1: pquerna, jerenkrantz, colm
-        jerenkrantz notes: I do prefer the version from r190033 (own if check).
-
      *) Reverse Proxy fixes: <Location> bug and Cookie support
         Patch is at
         http://marc.theaimsgroup.com/?l=apache-httpd-dev&m=112365629308138&q=p4
@@ -276,10 +280,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          http://people.apache.org/~wrowe/httpd-2.0-proto-timeout.patch
          +1: wrowe
 
-    *) Add missing va_end call
-         http://svn.apache.org/viewcvs?rev=321500&view=rev
-       +1: nd, trawick, colm
-
     *) mod_proxy: Fix PR37145
        (data loss with httpd-2.0.55 reverse proxy method=post).
        Trunk version of patch: