From: Graham Leggett <minfrin@apache.org>
Date: Thu, 26 Dec 2013 18:06:22 +0000 (+0000)
Subject: Vote, promote.
X-Git-Tag: 2.4.8~333
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7788bb80e70db1a1cb71de8c835e07add69a6268;p=apache

Vote, promote.


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

diff --git a/STATUS b/STATUS
index 94ddf46ce9..d9c4c3bdd4 100644
--- a/STATUS
+++ b/STATUS
@@ -98,6 +98,32 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * easy proposals to synch 2.4.x and trunk
+      - log.c: avoid needless apr_pstrdup()
+      - Use apr_pstrmemdup instead of apr_pstrndup when this is safe.
+      - Use apr_pstrmemdup instead of apr_pstrndup when this is safe.
+      - Remove redundant check
+      - 'ap_getword_conf' does not return NULL but an empty string
+      - Ease logic around 'ap_getword_conf' and drop useless line of code.
+      - 'ap_getword_conf' can not return NULL
+      - 'ap_getword_conf' can not return NULL
+      - Remove redundant check (already performed the line before)
+      - Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable
+    trunk patches:
+      - https://svn.apache.org/viewvc?view=revision&revision=1532122
+      - https://svn.apache.org/viewvc?view=revision&revision=1549676
+      - https://svn.apache.org/viewvc?view=revision&revision=1549680
+      - https://svn.apache.org/viewvc?view=revision&revision=1550651
+      - https://svn.apache.org/viewvc?view=revision&revision=1551005
+      - https://svn.apache.org/viewvc?view=revision&revision=1551009
+      - https://svn.apache.org/viewvc?view=revision&revision=1551010
+      - https://svn.apache.org/viewvc?view=revision&revision=1551011
+      - https://svn.apache.org/viewvc?view=revision&revision=1551012
+      - https://svn.apache.org/viewvc?view=revision&revision=1551013
+    2.4.x patches: trunk patches work
+                   http://people.apache.org/~jim/patches/ez-2.4-v2.patch
+    +1: jailletc36, jim, minfrin
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -152,32 +178,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patches: trunk patches work
     +1: jim, jorton
 
-  * easy proposals to synch 2.4.x and trunk
-      - log.c: avoid needless apr_pstrdup()
-      - Use apr_pstrmemdup instead of apr_pstrndup when this is safe.
-      - Use apr_pstrmemdup instead of apr_pstrndup when this is safe.
-      - Remove redundant check
-      - 'ap_getword_conf' does not return NULL but an empty string
-      - Ease logic around 'ap_getword_conf' and drop useless line of code.
-      - 'ap_getword_conf' can not return NULL
-      - 'ap_getword_conf' can not return NULL
-      - Remove redundant check (already performed the line before)
-      - Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable
-    trunk patches:
-      - https://svn.apache.org/viewvc?view=revision&revision=1532122
-      - https://svn.apache.org/viewvc?view=revision&revision=1549676
-      - https://svn.apache.org/viewvc?view=revision&revision=1549680
-      - https://svn.apache.org/viewvc?view=revision&revision=1550651
-      - https://svn.apache.org/viewvc?view=revision&revision=1551005
-      - https://svn.apache.org/viewvc?view=revision&revision=1551009
-      - https://svn.apache.org/viewvc?view=revision&revision=1551010
-      - https://svn.apache.org/viewvc?view=revision&revision=1551011
-      - https://svn.apache.org/viewvc?view=revision&revision=1551012
-      - https://svn.apache.org/viewvc?view=revision&revision=1551013
-    2.4.x patches: trunk patches work
-                   http://people.apache.org/~jim/patches/ez-2.4-v2.patch
-    +1: jailletc36, jim
-
   * mod_cache_disk hangs on windows reading from closed files
     trunk patch: http://svn.apache.org/r1547845
     2.4.x patch: trunk works