From: Eric Covener <covener@apache.org>
Date: Wed, 26 Nov 2014 02:38:08 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.11~148
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d34c6650d22c4cf6972c6117835be3092c5f5a6;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index 1bf748bdd38..7048452bb30 100644
--- a/STATUS
+++ b/STATUS
@@ -104,6 +104,31 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * mod_ssl: call ERR_free_strings() with OpenSSL >= 0.9.8e. Fixes memory
+     leak in mod_ssl on graceful restart. PR 53435.
+     trunk patch: http://svn.apache.org/r1638772
+     2.4.x patch: trunk works
+     +1 jkaluza, ylavic, covener
+
+   * easy proposals to synch 2.4.x and trunk
+        - ssl: Axe needless string duplication in setup for call to apr_proc_create()
+        - Fix sscanf format spotted by cppcheck
+        - fix indent.
+        - fix style
+        - Private function doesn't need ap_ prefix.
+        - tab vs space
+        - rename variables: s should be the server_rec
+     trunk patch: http://svn.apache.org/r1533765
+                  http://svn.apache.org/r1621419
+                  http://svn.apache.org/r1638159
+                  http://svn.apache.org/r1638188
+                  http://svn.apache.org/r1601603
+                  http://svn.apache.org/r1638412
+                  http://svn.apache.org/r1418763
+     2.4.x patch: trunk works
+                  http://people.apache.org/~jailletc36/backport10.patch
+     +1: jailletc36, ylavic, covener
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -186,12 +211,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              The new AH* in script_log could also cause parsing issues, but I'm
              fine with this personnaly.
 
-   * mod_ssl: call ERR_free_strings() with OpenSSL >= 0.9.8e. Fixes memory
-     leak in mod_ssl on graceful restart. PR 53435.
-     trunk patch: http://svn.apache.org/r1638772
-     2.4.x patch: trunk works
-     +1 jkaluza, ylavic, covener
-
    * event: avoid dereferencing a recently apr_pool_clear()'ed 
      event_conn_state_t *cs when ptrans is being recycled at EOR.
      trunk patch: http://svn.apache.org/r1638879
@@ -199,25 +218,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works
      +1 covener, ylavic
 
-   * easy proposals to synch 2.4.x and trunk
-        - ssl: Axe needless string duplication in setup for call to apr_proc_create()
-        - Fix sscanf format spotted by cppcheck
-        - fix indent.
-        - fix style
-        - Private function doesn't need ap_ prefix.
-        - tab vs space
-        - rename variables: s should be the server_rec
-     trunk patch: http://svn.apache.org/r1533765
-                  http://svn.apache.org/r1621419
-                  http://svn.apache.org/r1638159
-                  http://svn.apache.org/r1638188
-                  http://svn.apache.org/r1601603
-                  http://svn.apache.org/r1638412
-                  http://svn.apache.org/r1418763
-     2.4.x patch: trunk works
-                  http://people.apache.org/~jailletc36/backport10.patch
-     +1: jailletc36, ylavic, covener
-
     * event: avoid potentially concurrent access to a 'cs' right as it goes
       into lingering close.
       trunk patch: http://svn.apache.org/r1639614