From: Jim Jagielski <jim@apache.org>
Date: Thu, 30 Aug 2007 12:52:22 +0000 (+0000)
Subject: Promote
X-Git-Tag: 2.2.6~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a887c61a487641d6c0515aba60d4d371532535cb;p=thirdparty%2Fapache%2Fhttpd.git

Promote


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

diff --git a/STATUS b/STATUS
index 47af056cf44..dbfb8c02901 100644
--- a/STATUS
+++ b/STATUS
@@ -79,6 +79,16 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+    *) proxy_util.c: Backport cleanups (no functional change)
+       Trunk:
+         http://svn.apache.org/viewvc?view=rev&revision=429875
+         http://svn.apache.org/viewvc?view=rev&revision=429890
+       2.2.x version:
+         http://people.apache.org/~niq/proxy_util.patch
+       +1: niq, rpluem, jim
+       rpluem says: Better merge this proposal with the one
+       below and explain it as is a prerequisite for it.
+       Anyway I am +1 on both.
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
@@ -190,17 +200,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       trawick says: The new directives should be documented in trunk,
           so that docs are available for backport at the same time.
 
-    *) proxy_util.c: Backport cleanups (no functional change)
-       Trunk:
-         http://svn.apache.org/viewvc?view=rev&revision=429875
-         http://svn.apache.org/viewvc?view=rev&revision=429890
-       2.2.x version:
-         http://people.apache.org/~niq/proxy_util.patch
-       +1: niq, rpluem, jim
-       rpluem says: Better merge this proposal with the one
-       below and explain it as is a prerequisite for it.
-       Anyway I am +1 on both.
-
     *) proxy_util.c: Don't URLencode tilde in path component
        PR 38448
        http://svn.apache.org/viewvc?view=rev&revision=429879