From: Jim Jagielski <jim@apache.org>
Date: Tue, 21 Jan 2014 16:39:31 +0000 (+0000)
Subject: ipromote
X-Git-Tag: 2.4.8~231
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a2114c65c33b5e2745c39408d518da2052b2fca;p=apache

ipromote


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

diff --git a/STATUS b/STATUS
index 000442a954..8ef3033c04 100644
--- a/STATUS
+++ b/STATUS
@@ -114,6 +114,26 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.4.x patch: http://people.apache.org/~jim/patches/uds-2.4.patch
     +1: jim, druggeri, humbedooh
 
+  * mod_ssl: address the "init functions should return status code rather
+    than ssl_die()" todo from 2002 (avoid orphan IPC objects after startup
+    or reload failures, see also the "ssl_die() and pool cleanup" thread
+    on httpd-dev in Nov '13)
+    trunk patches: https://svn.apache.org/r1544774
+                   https://svn.apache.org/r1544812
+    2.4.x patch: https://people.apache.org/~kbrand/mod_ssl-2.4.x-ssldie.diff
+    +1: kbrand, trawick, jim
+
+  * mod_auth*z scan-build warnings in new code for 2.4.8
+    trunk patch: https://svn.apache.org/r1558483
+    2.4.x patch: trunk patch works
+    +1: trawick, covener, jim
+
+  * ssl_util_ocsp scan-build warning in old code
+    (the code is clearly wrong but completely harmless AFAICT)
+    trunk patch: https://svn.apache.org/r1534890
+    2.4.x patch: trunk patch works
+    +1: trawick, covener, jim
+  
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -183,26 +203,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     -1: covener, seems like unnecessary default change for 2.4. No issue w/o
         default change.  
 
-  * mod_ssl: address the "init functions should return status code rather
-    than ssl_die()" todo from 2002 (avoid orphan IPC objects after startup
-    or reload failures, see also the "ssl_die() and pool cleanup" thread
-    on httpd-dev in Nov '13)
-    trunk patches: https://svn.apache.org/r1544774
-                   https://svn.apache.org/r1544812
-    2.4.x patch: https://people.apache.org/~kbrand/mod_ssl-2.4.x-ssldie.diff
-    +1: kbrand, trawick, jim
-
-  * mod_auth*z scan-build warnings in new code for 2.4.8
-    trunk patch: https://svn.apache.org/r1558483
-    2.4.x patch: trunk patch works
-    +1: trawick, covener, jim
-
-  * ssl_util_ocsp scan-build warning in old code
-    (the code is clearly wrong but completely harmless AFAICT)
-    trunk patch: https://svn.apache.org/r1534890
-    2.4.x patch: trunk patch works
-    +1: trawick, covener, jim
-  
   * mod_dir: stop trying to index or redirect requests that are halfway
     through being rewritten by per-dir mod_rewrite. Old releases would skip any
     unknown r->handler. PR53929