promote

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

diff --git a/STATUS b/STATUS
index 5550c1cb71ca9c1189aceacd973c9e1ee76617f3..f88db9a3ca4818aea58759e0156372b45fa19f7d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -106,6 +106,49 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * mod_proxy: Add ap_proxy_define_match_worker() and use it for ProxyPassMatch
+     and ProxyMatch section to distinguish between normal workers and workers
+     with regex substitutions in the name. Implement handling of such workers
+     in ap_proxy_get_worker(). Fixes the bug when regex workers were not
+     matched and used for request. PR 43513.
+     trunk patch: http://svn.apache.org/r1609680
+                  http://svn.apache.org/r1641381
+     2.4.x patch: trunk works
+     +1: jkaluza, ylavic, jim
+
+  *) mod_deflate: A misplaced check prevents limiting small bodies with the
+     new inflate limits.  PR56872.
+     trunk patch: http://svn.apache.org/r1619383
+                  http://svn.apache.org/r1619444
+                  http://svn.apache.org/r1662245 (CHANGES entry)
+                  http://svn.apache.org/r1662246 (updated CHANGES entry)
+     2.4.x patch: trunk works (modulo CHANGES)
+                  http://people.apache.org/~ylavic/httpd-2.4.x-mod_deflate-PR56872.patch
+     +1: ylavic, covener, jim
+
+  *) mod_proxy: use the original (non absolute) form of the request-line's URI
+     for requests embedded in CONNECT payloads used to connect SSL backends via
+     a ProxyRemote forward-proxy. PR 55892.
+     trunk patch: http://svn.apache.org/r1665215
+                  http://svn.apache.org/r1665218 (CHANGES entry)
+     2.4.x patch: trunk works (modulo CHANGES)
+     +1: ylavic, wrowe, jim
+
+  *) mod_proxy_http: Don't expect the backend to ack the "Connection: close" to
+     finally close those not meant to be kept alive by SetEnv proxy-nokeepalive
+     or force-proxy-request-1.0.
+     trunk patch: http://svn.apache.org/r1658760 (partial, ap_proxy_clear_connection() raises no error in 2.4.x)
+     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-mod_proxy_http-nokeepalive_close.patch
+     +1: ylavic, covener, jim
+
+  *) mod_cgid: When the request thread can't contact the CGID daemon, 
+               Handle ENOENT during the startup/restart with the same delay
+               used for ECONNREFUSED. PR57685
+     trunk patch: http://svn.apache.org/r1667385 
+     2.4.x patch: trunk works
+     +1: covener, ylavic, jim
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -118,16 +161,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      ylavic: http://people.apache.org/~ylavic/httpd-r1632742-x-w.diff is the
              same patch without space changes (may be easier to review).
 
-   * mod_proxy: Add ap_proxy_define_match_worker() and use it for ProxyPassMatch
-     and ProxyMatch section to distinguish between normal workers and workers
-     with regex substitutions in the name. Implement handling of such workers
-     in ap_proxy_get_worker(). Fixes the bug when regex workers were not
-     matched and used for request. PR 43513.
-     trunk patch: http://svn.apache.org/r1609680
-                  http://svn.apache.org/r1641381
-     2.4.x patch: trunk works
-     +1: jkaluza, ylavic, jim
-
    * mod_proxy_ajp: Fix client connection errors handling and logged status
                     when it occurs.  PR 56823.
      trunk patch: http://svn.apache.org/r1643537
@@ -212,16 +245,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES, docs/log-message-tags)
      +1: ylavic
 
-  *) mod_deflate: A misplaced check prevents limiting small bodies with the
-     new inflate limits.  PR56872.
-     trunk patch: http://svn.apache.org/r1619383
-                  http://svn.apache.org/r1619444
-                  http://svn.apache.org/r1662245 (CHANGES entry)
-                  http://svn.apache.org/r1662246 (updated CHANGES entry)
-     2.4.x patch: trunk works (modulo CHANGES)
-                  http://people.apache.org/~ylavic/httpd-2.4.x-mod_deflate-PR56872.patch
-     +1: ylavic, covener, jim
-
   *) mod_proxy: Use the correct server name for SNI in case the backend
      SSL connection itself is established via a proxy server.  PR 57139
      trunk patch: http://svn.apache.org/r1634120
@@ -241,14 +264,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +0: jailletc36 - see a few comments on dev@, especially about unclosed <tr>
          ylavic: indeed, Christophe looks right
 
-  *) mod_proxy: use the original (non absolute) form of the request-line's URI
-     for requests embedded in CONNECT payloads used to connect SSL backends via
-     a ProxyRemote forward-proxy. PR 55892.
-     trunk patch: http://svn.apache.org/r1665215
-                  http://svn.apache.org/r1665218 (CHANGES entry)
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: ylavic, wrowe, jim
-
   *) core: If explicitly configured, use the KeepaliveTimeout value of the
      virtual host which handled the latest request on the connection, or by
      default the one of the first virtual host bound to the same IP:port.
@@ -299,13 +314,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: ylavic
      ylavic: updated with ap_proxy_connection_reusable(), missing in 2.4.x.
 
-  *) mod_proxy_http: Don't expect the backend to ack the "Connection: close" to
-     finally close those not meant to be kept alive by SetEnv proxy-nokeepalive
-     or force-proxy-request-1.0.
-     trunk patch: http://svn.apache.org/r1658760 (partial, ap_proxy_clear_connection() raises no error in 2.4.x)
-     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-mod_proxy_http-nokeepalive_close.patch
-     +1: ylavic, covener, jim
-
   *) mod_proxy_connect/wstunnel: If both client and backend sides get readable
      at the same time, don't lose errors occuring while forwarding on the first
      side when none occurs next on the other side, and abort.
@@ -345,13 +353,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: ylavic
 
-  *) mod_cgid: When the request thread can't contact the CGID daemon, 
-               Handle ENOENT during the startup/restart with the same delay
-               used for ECONNREFUSED. PR57685
-     trunk patch: http://svn.apache.org/r1667385 
-     2.4.x patch: trunk works
-     +1: covener, ylavic, jim
-
   *) core_filters: restore/disable TCP_NOPUSH option after non-blocking
      sendfile.
      trunk patch: http://svn.apache.org/r1669289