From: Rainer Jung <rjung@apache.org>
Date: Sat, 29 Oct 2011 09:57:55 +0000 (+0000)
Subject: Promote.
X-Git-Tag: 2.2.22~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8cd7138a9565a7334e0d168331fe2022abdb146;p=thirdparty%2Fapache%2Fhttpd.git

Promote.


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

diff --git a/STATUS b/STATUS
index 0f33d1bae75..4255835862e 100644
--- a/STATUS
+++ b/STATUS
@@ -92,6 +92,23 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * mod_win32: Invert logic for env var UTF-8 fixing.
+    Now we exclude a list of vars which we know for sure they
+    dont hold UTF-8 chars; all other vars will be fixed. This
+    has the benefit that now also all vars from 3rd-party modules
+    will be fixed. This fix is based on PR 13029 / 34985, and
+    includes now the SSL_ and GEOIP_ vars; otherwise its impossible
+    to run CGIs when mod_ssl and/or mod_geoip are loaded and those
+    mods return UTF-8 chars in any var during a request.
+    Trunk patch: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/win32/mod_win32.c?r1=1054347&r2=1146932
+    2.2.x patch: http://people.apache.org/~fuankg/diffs/2.2.x-mod_win32.c.diff
+    +1: fuankg, gsmith, rjung
+
+  * mod_log_config: Fix segfault for 'BufferedLogs Off'. PR 50861.
+    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1082518
+    2.2.x patch: Trunk patch works
+    +1: sf, trawick, rjung
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -105,18 +122,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     trawick: any reason it shouldn't be completely aligned with default_handler's
              choice to return OK vs. 500?
 
-  * mod_win32: Invert logic for env var UTF-8 fixing.
-    Now we exclude a list of vars which we know for sure they
-    dont hold UTF-8 chars; all other vars will be fixed. This
-    has the benefit that now also all vars from 3rd-party modules
-    will be fixed. This fix is based on PR 13029 / 34985, and
-    includes now the SSL_ and GEOIP_ vars; otherwise its impossible
-    to run CGIs when mod_ssl and/or mod_geoip are loaded and those
-    mods return UTF-8 chars in any var during a request.
-    Trunk patch: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/win32/mod_win32.c?r1=1054347&r2=1146932
-    2.2.x patch: http://people.apache.org/~fuankg/diffs/2.2.x-mod_win32.c.diff
-    +1: fuankg, gsmith, rjung
-
   * mod_ssl: Add SSLProxyMachineCertificateChainFile directive
     Uses openssl to construct a chain for each proxy cert. When a remote server requests
     a client certificate that is NOT the direct issuer of any available client
@@ -163,11 +168,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.2.x patch: http://people.apache.org/~rjung/patches/default-sslciphersuite_and_sslhonorciphers_2.2.patch
     +1: rjung, sf
 
-  * mod_log_config: Fix segfault for 'BufferedLogs Off'. PR 50861.
-    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1082518
-    2.2.x patch: Trunk patch works
-    +1: sf, trawick, rjung
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * core: Support wildcards in both the directory and file components of