From: Sander Temme <sctemme@apache.org>
Date: Wed, 11 Jul 2007 23:11:49 +0000 (+0000)
Subject: Vote, promote and note
X-Git-Tag: 2.0.60~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d28f336c83531022696805c34c83b2ac2d0baaf0;p=thirdparty%2Fapache%2Fhttpd.git

Vote, promote and note

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

diff --git a/STATUS b/STATUS
index 71e7f4f8684..f59ea33712d 100644
--- a/STATUS
+++ b/STATUS
@@ -133,7 +133,7 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
         http://people.apache.org/~jorton/httpd-2.0.x-CVE-2007-3304.patch
       +1: jorton, jim, rpluem
 
-    *) Backport 520733; more helpful LoadModule feedback, so it reads;
+    * Backport 520733; more helpful LoadModule feedback, so it reads;
           Syntax error in -C/-c directive:
           API module structure 'ftp_module' in file /.../modules/mod_ftp.so 
           is garbled - expected signature 41503230 but saw 41503232 -
@@ -142,6 +142,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
        http://svn.apache.org/viewvc?view=rev&rev=520733
        +1: wrowe, sctemme, rpluem
 
+    * SECURITY: CVE-2006-5752
+      mod_status XSS fix for broken browsers:
+        http://svn.apache.org/viewvc?view=rev&rev=549159
+      +1: jorton, rpluem, sctemme
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to
     identify exactly what the proposed changes are!  Add all new
@@ -150,6 +155,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     * ApacheMonitor: Fix Windows Vista detection.
       http://svn.apache.org/viewvc?view=rev&revision=536052      
       +1: mturk
+      sctemme: as wrowe notes in 2.2 STATUS, it would make sense to
+      make this future-resilient.
       
     *) Reverse Proxy fixes: <Location> bug and Cookie support
         Patch is at
@@ -164,11 +171,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          http://svn.apache.org/viewcvs.cgi?rev=102870&view=rev
        +1: wrowe, colm
 
-    * SECURITY: CVE-2006-5752
-      mod_status XSS fix for broken browsers:
-        http://svn.apache.org/viewvc?view=rev&rev=549159
-      +1: jorton, rpluem
-
 PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:
 
     *) mod_headers: Support {...}s tag for SSL variable lookup.