From: Jim Jagielski <jim@apache.org>
Date: Fri, 10 Aug 2007 11:10:31 +0000 (+0000)
Subject: Promote approved patches
X-Git-Tag: 2.2.5~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44fdaf92643a1830632ec5225b7d169f24544291;p=thirdparty%2Fapache%2Fhttpd.git

Promote approved patches


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

diff --git a/STATUS b/STATUS
index 1ae9beb17ef..ac8d555e25b 100644
--- a/STATUS
+++ b/STATUS
@@ -78,9 +78,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-      
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-
     * ApacheMonitor: Fix Windows Vista detection.
       http://svn.apache.org/viewvc?view=rev&revision=536052
       http://svn.apache.org/viewvc?view=rev&revision=556879
@@ -94,6 +91,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       svn diff -r536051:557188 \
           http://svn.apache.org/repos/asf/httpd/httpd/trunk/support/win32/ApacheMonitor.c
 
+    * mod_proxy_ajp: Add support of ProxyIOBufferSize.
+      Trunk version of patch:
+        http://svn.apache.org/viewvc?view=rev&rev=467014
+        http://svn.apache.org/viewvc?view=rev&revision=467257
+        http://svn.apache.org/viewvc?view=rev&revision=510522
+      2.2.x version of patch:
+        http://people.apache.org/~jim/patches/ProxyIOBufferSize.2.patch
+      +1: jim, mturk, fuankg
+
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+
     * mpm_winnt: Fix return values from wait_for_many_objects.
       Note - this is required to avoid hangups of socket #64, #128
       as Microsoft set aside 64 reserved values.
@@ -239,15 +247,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        check for a buffer overflow a few lines later is not correct any more
        (now an error (APR_ENOSPC) is returned instead).
 
-    * mod_proxy_ajp: Add support of ProxyIOBufferSize.
-      Trunk version of patch:
-        http://svn.apache.org/viewvc?view=rev&rev=467014
-        http://svn.apache.org/viewvc?view=rev&revision=467257
-        http://svn.apache.org/viewvc?view=rev&revision=510522
-      2.2.x version of patch:
-        http://people.apache.org/~jim/patches/ProxyIOBufferSize.2.patch
-      +1: jim, mturk, fuankg
-
     * multiple files,	Trivial cleanups
       PR: 39518 - Christophe JAILLET
       http://svn.apache.org/viewvc?view=rev&revision=557837