From: Rainer Jung <rjung@apache.org>
Date: Thu, 13 May 2010 14:25:42 +0000 (+0000)
Subject: Promote.
X-Git-Tag: 2.2.16~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98e95505c51c42f1a432b2b6be2332dc4c7bf93a;p=thirdparty%2Fapache%2Fhttpd.git

Promote.


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

diff --git a/STATUS b/STATUS
index fef24e68106..134ea2bcfcc 100644
--- a/STATUS
+++ b/STATUS
@@ -97,27 +97,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.2.x patch: http://people.apache.org/~minfrin/htcacheclean-pid.patch
     +1: minfrin, sf, trawick
 
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-  [ New proposals should be added at the end of the list ]
-
- * unixd: set suexec_enabled correctly when httpd is run by non-root
-   PR 42175
-   Trunk Patch: http://cvs.apache.org/viewvc?view=rev&revision=791337
-   2.2.x Patch: https://issues.apache.org/bugzilla/attachment.cgi?id=20004
-   +1: niq
-   -0: wrowe; Please refer to man 'access' BUGS section about linux 2.4 
-              vs 2.6 kernels, potentially a suspect test for root.
-   sf:        Couldn't the linux 2.4 bug be worked around by calling access
-              twice? Once with R_OK and once with X_OK.
-
-  * mod_ssl: modules/ssl/ssl_engine_init.c (ssl_init_ctx_cleanup_proxy):
-    Unset pkp->certs pointer after freeing the array; fixes segfault at
-    startup if the certs are shared across >1 server_rec.
-    Trunk patch: http://svn.apache.org/viewvc?rev=417988&view=rev
-    2.2.x patch: Trunk patch works
-    (Original patch by jorton)
-    +1: minfrin, rjung
-
   * mod_proxy: Tone down a warning message that appears when the same
     backend website is reverse proxied two or more times into the
     frontend URL space.
@@ -142,6 +121,27 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     rjung: We should add a note about the first version providing this
            option in the docs page, like e.g. we did for SSLInsecureRenegotiation.
 
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ New proposals should be added at the end of the list ]
+
+ * unixd: set suexec_enabled correctly when httpd is run by non-root
+   PR 42175
+   Trunk Patch: http://cvs.apache.org/viewvc?view=rev&revision=791337
+   2.2.x Patch: https://issues.apache.org/bugzilla/attachment.cgi?id=20004
+   +1: niq
+   -0: wrowe; Please refer to man 'access' BUGS section about linux 2.4 
+              vs 2.6 kernels, potentially a suspect test for root.
+   sf:        Couldn't the linux 2.4 bug be worked around by calling access
+              twice? Once with R_OK and once with X_OK.
+
+  * mod_ssl: modules/ssl/ssl_engine_init.c (ssl_init_ctx_cleanup_proxy):
+    Unset pkp->certs pointer after freeing the array; fixes segfault at
+    startup if the certs are shared across >1 server_rec.
+    Trunk patch: http://svn.apache.org/viewvc?rev=417988&view=rev
+    2.2.x patch: Trunk patch works
+    (Original patch by jorton)
+    +1: minfrin, rjung
+
   * mod_log_config: Make ${cookie}C correctly match whole cookie names
     instead of substrings.
     PR: 28037