promote

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

diff --git a/STATUS b/STATUS
index 4ba1f7eef9770983e73d6239ab906f4595f50921..8829465ce21b933bcb74812b5f37edcaa313d118 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -138,6 +138,32 @@ 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 and 64537.
+     trunk patch: http://svn.apache.org/r1609680
+                  http://svn.apache.org/r1609688
+                  http://svn.apache.org/r1641381
+                  http://svn.apache.org/r1826289
+                  http://svn.apache.org/r1826313
+                  http://svn.apache.org/r1878467
+                  http://svn.apache.org/r1878994
+                  http://svn.apache.org/r1879000
+                  http://svn.apache.org/r1879001
+                  http://svn.apache.org/r1879002
+                  http://svn.apache.org/r1879361
+     2.4.x patch: http://people.apache.org/~ylavic/patches/httpd-2.4.x-ap_proxy_define_match_worker-v6.patch
+     +1: ylavic, minfrin (with an MMN bump), jim (agree w/ minfrin)
+
+  *) mod_proxy_uwsgi: Avoid NULL pointer dereferences for empty environment variable values
+      http://svn.apache.org/r1879878
+   Backport version for 2.4.x of patch:
+      Trunk version of patch works
+      svn merge -c 1879878 ^/httpd/httpd/trunk .
+   +1: jailletc36, covener, gbechis, jim
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -161,25 +187,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              months/years without any action item :)
      ylavic: will look at it ASAP..
 
-  *) 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 and 64537.
-     trunk patch: http://svn.apache.org/r1609680
-                  http://svn.apache.org/r1609688
-                  http://svn.apache.org/r1641381
-                  http://svn.apache.org/r1826289
-                  http://svn.apache.org/r1826313
-                  http://svn.apache.org/r1878467
-                  http://svn.apache.org/r1878994
-                  http://svn.apache.org/r1879000
-                  http://svn.apache.org/r1879001
-                  http://svn.apache.org/r1879002
-                  http://svn.apache.org/r1879361
-     2.4.x patch: http://people.apache.org/~ylavic/patches/httpd-2.4.x-ap_proxy_define_match_worker-v6.patch
-     +1: ylavic, minfrin (with an MMN bump), jim (agree w/ minfrin)
-
  *) "[mod_dav_fs etag handling] should really honor the FileETag setting".
      - It now does.
      - Add "Digest" to FileETag directive, allowing a strong ETag to be
@@ -221,13 +228,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       svn merge -c 1879822,1879831,1879840 ^/httpd/httpd/trunk .
    +1: rpluem, jim
 
-  *) mod_proxy_uwsgi: Avoid NULL pointer dereferences for empty environment variable values
-      http://svn.apache.org/r1879878
-   Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1879878 ^/httpd/httpd/trunk .
-   +1: jailletc36, covener, gbechis, jim
-
   *) mod_ssl: Support HTTP request body buffering with TLSv1.3.
      trunk patch: http://svn.apache.org/r1870095
                   http://svn.apache.org/r1870097