From: Ruediger Pluem <rpluem@apache.org>
Date: Fri, 11 Feb 2011 12:16:02 +0000 (+0000)
Subject: * Promote
X-Git-Tag: 2.2.18~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b6a34636101d7b38893107c69cbf06dd640dca4;p=thirdparty%2Fapache%2Fhttpd.git

* Promote

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

diff --git a/STATUS b/STATUS
index 410b8acf6da..50b61b6f267 100644
--- a/STATUS
+++ b/STATUS
@@ -90,6 +90,26 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * suEXEC: Add Suexec directive to disable suEXEC without renaming the
+     binary (Suexec Off), or force startup failure if suEXEC is required
+     but not supported (Suexec On).
+     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1033519
+     Simpler 2.2.x patch: http://people.apache.org/~trawick/suexec-2.2.txt
+       (unlike trunk, a) doesn't cause startup to fail if SuexecUserGroup
+       coded but suEXEC disabled, and b) doesn't add field to unixd structure
+       with reason string for why suEXEC is disabled)
+     Plz consider where doc for directive should go.  Patch has it in core, as
+     enabling/disabling the basic capability is not split out into mod_unixd 2.2.x.
+     +1: trawick, covener, wrowe
+
+   * mod_proxy_http: Become aware of ssl handshake failures when attempting
+     to pass request. Makes it so workers are put in error state when a
+     handshake failure is encountered.
+     PR50332
+     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1039304
+                  http://svn.apache.org/viewvc?view=revision&revision=1053584
+     2.2.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=26450
+     +1: rpluem, jim, wrowe
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -164,27 +184,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      rpluem says: Mind to update the 2.2.x version of the patch with r1052224,
                   r1052314, r1055246 and r1055570 (Comment fix by Jim)?
 
-   * suEXEC: Add Suexec directive to disable suEXEC without renaming the
-     binary (Suexec Off), or force startup failure if suEXEC is required
-     but not supported (Suexec On).
-     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1033519
-     Simpler 2.2.x patch: http://people.apache.org/~trawick/suexec-2.2.txt
-       (unlike trunk, a) doesn't cause startup to fail if SuexecUserGroup
-       coded but suEXEC disabled, and b) doesn't add field to unixd structure
-       with reason string for why suEXEC is disabled)
-     Plz consider where doc for directive should go.  Patch has it in core, as
-     enabling/disabling the basic capability is not split out into mod_unixd 2.2.x.
-     +1: trawick, covener, wrowe
-
-   * mod_proxy_http: Become aware of ssl handshake failures when attempting
-     to pass request. Makes it so workers are put in error state when a
-     handshake failure is encountered.
-     PR50332
-     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1039304
-                  http://svn.apache.org/viewvc?view=revision&revision=1053584
-     2.2.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=26450
-     +1: rpluem, jim, wrowe
-
   * core: Add NoDecode option to AllowEncodedSlashes to turn off decoding
     of encoded slashes in path info.  (This is already the behavior of
     AllowEncodedSlashes On in trunk.)