]> granicus.if.org Git - apache/commitdiff
ez promote
authorJim Jagielski <jim@apache.org>
Wed, 2 Mar 2016 13:50:45 +0000 (13:50 +0000)
committerJim Jagielski <jim@apache.org>
Wed, 2 Mar 2016 13:50:45 +0000 (13:50 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1733288 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index a98a8629209673e97149e9f92923d9d4212e6040..6516881f83e1b4d269faf2b53311ffe38248cc94 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -112,6 +112,18 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) proxy_util: Add missing APLOGNO()s from r1732266 (already backported
+                 to 2.4.x/19)
+     trunk patch: http://svn.apache.org/r1732954
+     2.4.x patch: trunk works (modulo docs/log-message-tags)
+     +1: ylavic, icing, jim
+
+  *) core: Add missing APLOGNO() from r1729495 (somehow r1725395 was
+           backported in r1729495 but without this "server/core.c" change)
+     trunk patch: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?r1=1725395&r2=1725394&pathrev=1725395&view=patch
+     2.4.x patch: trunk above works
+     +1: ylavic, icing, jim
+
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -149,18 +161,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          Trunk version of patch works modulo CHANGES
      +1: icing, ylavic
 
-  *) proxy_util: Add missing APLOGNO()s from r1732266 (already backported
-                 to 2.4.x/19)
-     trunk patch: http://svn.apache.org/r1732954
-     2.4.x patch: trunk works (modulo docs/log-message-tags)
-     +1: ylavic, icing, jim
-
-  *) core: Add missing APLOGNO() from r1729495 (somehow r1725395 was
-           backported in r1729495 but without this "server/core.c" change)
-     trunk patch: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?r1=1725395&r2=1725394&pathrev=1725395&view=patch
-     2.4.x patch: trunk above works
-     +1: ylavic, icing, jim
-
   *) mod_proxy: Play/restore the TLS-SNI on new backend connections which
      had to be issued because the remote closed the previous/reusable one
      during idle (keep-alive) time.