From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 6 Aug 2009 07:25:54 +0000 (+0000)
Subject: Acceptable
X-Git-Tag: 2.2.13~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a93214b969c6443c785994e15c50b1c6e1f35411;p=thirdparty%2Fapache%2Fhttpd.git

Acceptable

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

diff --git a/STATUS b/STATUS
index fba0fd52062..0d7a6e15858 100644
--- a/STATUS
+++ b/STATUS
@@ -81,9 +81,21 @@ CURRENT RELEASE NOTES:
 
 RELEASE SHOWSTOPPERS:
 
+
+
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+ * mod_ssl / ab: backport support for OpenSSL 1.0.0 from HEAD.
+   Trunk patches: http://svn.apache.org/viewvc?view=rev&revision=748396
+                  http://svn.apache.org/viewvc?view=rev&revision=749466
+                  http://svn.apache.org/viewvc?view=rev&revision=798274
+                  http://svn.apache.org/viewvc?view=rev&revision=798989
+   2.2.x patch:   http://people.apache.org/~fuankg/diffs/openssl-1.x-2.2.x.diff
+   +1: fuankg, rpluem, wrowe
+
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -113,14 +125,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    -0: wrowe; Please refer to man BUGS of access for linux 2.4 vs 2.6 kernels,
               potentially a suspect test for root.
 
- * mod_ssl / ab: backport support for OpenSSL 1.0.0 from HEAD.
-   Trunk patches: http://svn.apache.org/viewvc?view=rev&revision=748396
-                  http://svn.apache.org/viewvc?view=rev&revision=749466
-                  http://svn.apache.org/viewvc?view=rev&revision=798274
-                  http://svn.apache.org/viewvc?view=rev&revision=798989
-   2.2.x patch:   http://people.apache.org/~fuankg/diffs/openssl-1.x-2.2.x.diff
-   +1: fuankg, rpluem
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * srclib/pcre and vendor/pcre