From: Roy T. Fielding <fielding@apache.org>
Date: Sat, 17 May 2008 00:15:54 +0000 (+0000)
Subject: vote and promote
X-Git-Tag: 2.2.9~154
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b427d03e5f1eaef6f29cdeaee687917255e0d79;p=thirdparty%2Fapache%2Fhttpd.git

vote and promote

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

diff --git a/STATUS b/STATUS
index e600d90a934..9dd75ab719e 100644
--- a/STATUS
+++ b/STATUS
@@ -115,6 +115,15 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
        Trunk version works
    +1: rpluem, jim, fielding
 
+* mod_ssl: Fix a memory leak with connections that have zlib compression
+  turned on. PR 44975 [Joe Orton, Amund Elstad <Amund.Elstad ist.com>, 
+  Dr Stephen Henson <steve openssl.org>]
+      Trunk version of patch:
+         http://svn.apache.org/viewvc?rev=654119&view=rev
+      Backport version for 2.2.x of patch:
+         Trunk version of patch works
+      +1: rpluem, jim, fielding
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -236,15 +245,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   Roy replies: the patch adds an id lookup and replaces the atoi id
       with the validated result.  Invalid input will now error out.
 
-* mod_ssl: Fix a memory leak with connections that have zlib compression
-  turned on. PR 44975 [Joe Orton, Amund Elstad <Amund.Elstad ist.com>, 
-  Dr Stephen Henson <steve openssl.org>]
-      Trunk version of patch:
-         http://svn.apache.org/viewvc?rev=654119&view=rev
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-      +1: rpluem, jim
-
 PATCHES/ISSUES THAT ARE STALLED
 
    * beos MPM: Create pmain pool and run modules' child_init hooks when