From: Jim Jagielski <jim@apache.org>
Date: Sat, 1 Sep 2007 12:08:08 +0000 (+0000)
Subject: promote accepted
X-Git-Tag: 2.2.6~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afd26a3a38641d48b92f6024b5b5dbcf3cceff92;p=thirdparty%2Fapache%2Fhttpd.git

promote accepted


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

diff --git a/STATUS b/STATUS
index f59233656a9..64e7307de4d 100644
--- a/STATUS
+++ b/STATUS
@@ -79,6 +79,24 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * ssl/ssl_engine_io.c: Fix SSL Protocol hexdumps for EBCDIC systems
+     A conversion is required for mod_ssl to display the SSL protocol correctly
+     on EBCDIC machines. Backport of rev. 349906
+     Trunk version of patch:
+       http://svn.apache.org/viewvc?view=rev&revision=349906 from 2005-11-30
+     2.2.x version of patch:
+       http://people.apache.org/~martin/ssl_engine_io.c.349906.patch
+     +1: martin, rpluem, jim
+
+   * mod_proxy_http: Don't wait for response body in a HEAD request
+     PR 41644
+     http://svn.apache.org/viewvc?view=rev&revision=571002
+     +1: niq, rpluem, jim
+
+   * mod_proxy: Add ProxyPass status option to ignore errors
+     PR 43167
+     http://svn.apache.org/viewvc?view=rev&revision=571338
+     +1: niq, rpluem, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
@@ -169,31 +187,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       trawick says: The new directives should be documented in trunk,
           so that docs are available for backport at the same time.
 
-   * ssl/ssl_engine_io.c: Fix SSL Protocol hexdumps for EBCDIC systems
-     A conversion is required for mod_ssl to display the SSL protocol correctly
-     on EBCDIC machines. Backport of rev. 349906
-     Trunk version of patch:
-       http://svn.apache.org/viewvc?view=rev&revision=349906 from 2005-11-30
-     2.2.x version of patch:
-       http://people.apache.org/~martin/ssl_engine_io.c.349906.patch
-     +1: martin, rpluem, jim
-
    * mod_proxy_connect: Fix potential proxy segfault
      PR 40756
      http://svn.apache.org/viewvc?view=rev&revision=571414
      +1: niq, jim
 
-   * mod_proxy_http: Don't wait for response body in a HEAD request
-     PR 41644
-     http://svn.apache.org/viewvc?view=rev&revision=571002
-     +1: niq, rpluem, jim
-
-   * mod_proxy: Add ProxyPass status option to ignore errors
-     PR 43167
-     http://svn.apache.org/viewvc?view=rev&revision=571338
-     +1: niq, rpluem, jim
-
-
 PATCHES/ISSUES THAT ARE STALLED
 
     * PKCS#7: backport PCKS#7 patches from trunk.