From: Jim Jagielski <jim@apache.org>
Date: Sun, 30 Sep 2012 15:47:15 +0000 (+0000)
Subject: Promote
X-Git-Tag: 2.0.65~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7814db6d923064589dbda8a9bbb29a0240fcbac;p=thirdparty%2Fapache%2Fhttpd.git

Promote


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

diff --git a/STATUS b/STATUS
index 7f82af6046b..607a0078162 100644
--- a/STATUS
+++ b/STATUS
@@ -184,6 +184,13 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
 
+  * mpm_common.h: Add prototype for initgroups().
+    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1082250
+    2.2.x patch: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/include/mpm_common.h?r1=556936&r2=1092275  
+    2.0.x patch: http://people.apache.org/~fuankg/diffs/2.0.x-mpm_common.diff
+    +1 fuankg, rjung, jim
+
+
 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
@@ -243,12 +250,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     Backport: http://people.apache.org/~rjung/patches/sslhonorcipher-2.0.patch
     +1: rjung
 
-  * mpm_common.h: Add prototype for initgroups().
-    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1082250
-    2.2.x patch: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/include/mpm_common.h?r1=556936&r2=1092275  
-    2.0.x patch: http://people.apache.org/~fuankg/diffs/2.0.x-mpm_common.diff
-    +1 fuankg, rjung, jim
-
 PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:
 
     *) mod_headers: Support {...}s tag for SSL variable lookup.