From: Jeff Trawick <trawick@apache.org>
Date: Fri, 15 Apr 2011 12:28:17 +0000 (+0000)
Subject: vote, promote
X-Git-Tag: 2.2.18~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c822ce77f05caa2bfb2aeb55f817f618a8345c40;p=thirdparty%2Fapache%2Fhttpd.git

vote, promote


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

diff --git a/STATUS b/STATUS
index 643658f0f18..5f227c04ca0 100644
--- a/STATUS
+++ b/STATUS
@@ -96,6 +96,13 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.2.x patch: Trunk version of patch works with fuzz
      +1: sf, trawick, wrowe
 
+  * mod_win32: Add shebang check so that .vbs scripts can work as CGI.
+     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1054347
+     2.2.x patch: Trunk version of patch works with offset  
+     +1 fuankg, wrowe, trawick
+     wrowe notes: CHANGES needs to be clearer than the text above.
+     Trunk/CHANGES and 2.2.x/CHANGES need an update.
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -105,12 +112,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     Trunk patch (applies for worker): http://svn.apache.org/viewvc?view=revision&revision=1064269
     2.2.x patch (for event): http://people.apache.org/~igalic/patches/event-mpm-fdqueue.patch
 
-  * mod_win32: Add shebang check so that .vbs scripts can work as CGI.
-     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1054347
-     2.2.x patch: Trunk version of patch works with offset  
-     +1 fuankg, wrowe
-     wrowe notes: CHANGES needs to be clearer than the text above.
-
   * HTTP Protocol: Fix handling of extra request data sent with Expect: 100
     PR 47087
     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=888310