Promote

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

diff --git a/STATUS b/STATUS
index 9d2f4c3f73a3753f79085f03e64133e7ba88babb..d395880f72664cdf70de257bbb5ffa7793297779 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -79,6 +79,52 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * core log.c: Work around possible solutions rejected by apr for
+    the old implementation of apr_proc_create(), and explicitly pass
+    the output and error channels to all log processes created.
+    This goes all the way back to piped logs failing to run on win32.
+    Not in or needed at trunk/, as apr 1.3.0 has the proper fix.
+      http://people.apache.org/~wrowe/httpd-2.0-2.2-procattr-bugfix-log.c.patch
+    +1: wrowe, rpluem, jim
+
+  * mod_proxy_http: Correctly forward unexpected interim (HTTP 1xx) responses
+    incorporating ap_send_interim_response core API
+    PR 16518
+    trunk:
+      http://svn.apache.org/viewvc?view=rev&revision=582630
+      http://svn.apache.org/viewvc?view=rev&revision=582652
+      http://svn.apache.org/viewvc?view=rev&revision=582631
+      http://svn.apache.org/viewvc?view=rev&revision=588806
+    2.2.x:
+      http://people.apache.org/~niq/16508.patch
+    +1: niq, rpluem, jim
+
+  * http_filters: Fix handling of unrecognised Transfer Encodings
+    PR 43882
+    http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_filters.c?r1=592951&r2=599137
+    http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?r1=595672&r2=595671&pathrev=595672 (CHANGES)
+    +1: niq, rpluem, jim
+    niq says: modified in 599059 (following suggestion by trawick)
+
+  * mod_ssl: Enable to build with OpenSSL 0.9.9
+    trunk:
+       http://svn.apache.org/viewvc?view=rev&revision=598019
+    2.2.x:
+       Trunk patches apply
+    +1: fuankg, rpluem, jim
+
+  * mod_filter: Don't try to support chained filters when it doesn't work
+    PR 43956
+    http://svn.apache.org/viewvc?view=rev&revision=598299
+    http://svn.apache.org/viewvc?view=rev&revision=599393
+    +1: niq, rpluem, jim
+
+  * http_protocol: Escape request method in 413 error reporting.
+    Determined to be not generally exploitable, but a flaw in any case.
+    PR 44014 [Victor Stinner <victor.stinner inl.fr>]
+       http://svn.apache.org/viewvc?view=rev&rev=600645
+    +1: wrowe, rpluem, jim
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -108,26 +154,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        Trunk version of patch works
     +1: rpluem, jim
 
-  * core log.c: Work around possible solutions rejected by apr for
-    the old implementation of apr_proc_create(), and explicitly pass
-    the output and error channels to all log processes created.
-    This goes all the way back to piped logs failing to run on win32.
-    Not in or needed at trunk/, as apr 1.3.0 has the proper fix.
-      http://people.apache.org/~wrowe/httpd-2.0-2.2-procattr-bugfix-log.c.patch
-    +1: wrowe, rpluem, jim
-
-  * mod_proxy_http: Correctly forward unexpected interim (HTTP 1xx) responses
-    incorporating ap_send_interim_response core API
-    PR 16518
-    trunk:
-      http://svn.apache.org/viewvc?view=rev&revision=582630
-      http://svn.apache.org/viewvc?view=rev&revision=582652
-      http://svn.apache.org/viewvc?view=rev&revision=582631
-      http://svn.apache.org/viewvc?view=rev&revision=588806
-    2.2.x:
-      http://people.apache.org/~niq/16508.patch
-    +1: niq, rpluem, jim
-
   * server/protocol.c: Prevent 1-byte overflow on 8192 boundary in
     ap_vrprintf(). PR 43310
     trunk:
@@ -160,13 +186,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        http://people.apache.org/~jim/patches/reqtail-patch.txt
     +1: jim, rpluem
 
-  * http_filters: Fix handling of unrecognised Transfer Encodings
-    PR 43882
-    http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_filters.c?r1=592951&r2=599137
-    http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?r1=595672&r2=595671&pathrev=595672 (CHANGES)
-    +1: niq, rpluem, jim
-    niq says: modified in 599059 (following suggestion by trawick)
-
    * mod_proxy: Support variable interpolation in reverse proxy configuration
      (revised proposal dealing with wrowe's concerns).
      trunk:
@@ -180,13 +199,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   patch and a minor bump (changes to public mod_proxy.h) and
                   assume you are +1 to your own proposal.
 
-  * mod_ssl: Enable to build with OpenSSL 0.9.9
-    trunk:
-       http://svn.apache.org/viewvc?view=rev&revision=598019
-    2.2.x:
-       Trunk patches apply
-    +1: fuankg, rpluem, jim
-
   * mod_substitute: New module for on-the-fly response rewrite-like
     capability.
     trunk:
@@ -199,12 +211,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                      and I would like to see the usage of tpool in the usage of
                      the SEDSCAT macro.
 
-  * mod_filter: Don't try to support chained filters when it doesn't work
-    PR 43956
-    http://svn.apache.org/viewvc?view=rev&revision=598299
-    http://svn.apache.org/viewvc?view=rev&revision=599393
-    +1: niq, rpluem, jim
-
   * mod_autoindex: make spacing in HTML code the same as before r593816. This
         avoids that the autoindex test (t/modules/autoindex) fails. Adjusting
         the autoindex test would cause it to fail with older versions and would
@@ -225,12 +231,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        Trunk version of patch works
     +1: rpluem, jim
 
-  * http_protocol: Escape request method in 413 error reporting.
-    Determined to be not generally exploitable, but a flaw in any case.
-    PR 44014 [Victor Stinner <victor.stinner inl.fr>]
-       http://svn.apache.org/viewvc?view=rev&rev=600645
-    +1: wrowe, rpluem, jim
-
   * core: Fix broken chunk filtering that causes all non blocking reads to be
           converted into blocking reads
     PR 19954 / 41056