promote

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

diff --git a/STATUS b/STATUS
index 0abbbd442355afddc457a445d1c44267569f4e10..b80dd089cdbb1f7f80d1a7018d5967f2cfe354fe 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -119,6 +119,13 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) logresolve: Fix segfault with logresolve -c and IPv6
+     Due to a logic error, there could be a NULL pointer dereference.
+     [Stefan Fritsch]
+     trunk patch: http://svn.apache.org/r1745863
+                  http://svn.apache.org/r1745864
+     2.4.x patch: trunk works
+     +1: jailletc36, minfrin, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -132,14 +139,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works
      +1: jim, minfrin
 
-  *) logresolve: Fix segfault with logresolve -c and IPv6
-     Due to a logic error, there could be a NULL pointer dereference.
-     [Stefan Fritsch]
-     trunk patch: http://svn.apache.org/r1745863
-                  http://svn.apache.org/r1745864
-     2.4.x patch: trunk works
-     +1: jailletc36, minfrin, jim
-
   *) mod_proxy: Provide an RFC1035 compliant version of the hostname in the
      proxy_worker_shared structure. PR62085
      trunk patch: http://svn.apache.org/r1824176