votes

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

diff --git a/STATUS b/STATUS
index 8019c7289c9adf2f4edd8db57636e70bac976b25..b7e012bc2e993bd675c58377dd3aaf3ba4ab4bcc 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -152,6 +152,27 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) Easy patches: synch 2.4.x and trunk
+         - core: constify pointers in ap_expr lookup tables.  ~1/2Kb moves to r/o text section
+         - core: Optimize performance in ap_normalize_path()
+         - core: Optimize code flow in log_backtrace()
+         - Fix a typo in README.cmake
+         - Add a missing 'be' in README.CHANGES
+     trunk patch:
+          https://svn.apache.org/r1877350
+          https://svn.apache.org/r1894021
+          https://svn.apache.org/r1906379
+          https://svn.apache.org/r1908657
+          https://svn.apache.org/r1908150
+     2.4.x patch: svn merge -c 1877350,1894021,1906379,1908657,1908150 ^/httpd/httpd/trunk .
+     +1: jailletc36, rpluem, gbechis
+
+  *) core: Optimize send_brigade_nonblocking()
+     trunk patch:
+        https://svn.apache.org/r1892450
+        https://svn.apache.org/r1909966
+     2.4.x patch: svn merge -c 1892450,1909966 ^/httpd/httpd/trunk .
+     +1: jailletc36, rpluem, icing
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -197,7 +218,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      Backport version for 2.4.x of patch:
       Trunk version of patch works
       svn merge -c 1909241 ^/httpd/httpd/trunk .
-     +1: rpluem,
+     +1: rpluem, icing
 
   *) mod_deflate: Add DeflateAlterETag to control how the ETag
      is modified. The 'NoChange' parameter mimics 2.2.x behavior.
@@ -209,28 +230,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: jfclere, rpluem,
      rpluem says: Does anyone know why we don't merge the server config?
 
-  *) Easy patches: synch 2.4.x and trunk
-         - core: constify pointers in ap_expr lookup tables.  ~1/2Kb moves to r/o text section
-         - core: Optimize performance in ap_normalize_path()
-         - core: Optimize code flow in log_backtrace()
-         - Fix a typo in README.cmake
-         - Add a missing 'be' in README.CHANGES
-     trunk patch:
-          https://svn.apache.org/r1877350
-          https://svn.apache.org/r1894021
-          https://svn.apache.org/r1906379
-          https://svn.apache.org/r1908657
-          https://svn.apache.org/r1908150
-     2.4.x patch: svn merge -c 1877350,1894021,1906379,1908657,1908150 ^/httpd/httpd/trunk .
-     +1: jailletc36, rpluem, gbechis
-
-  *) core: Optimize send_brigade_nonblocking()
-     trunk patch:
-        https://svn.apache.org/r1892450
-        https://svn.apache.org/r1909966
-     2.4.x patch: svn merge -c 1892450,1909966 ^/httpd/httpd/trunk .
-     +1: jailletc36, rpluem
-
   *) mod_proxy: If we fail to connect to all looked up IP's from the worker
      lookup cache it might be caused by a change on DNS side. Try another
      DNS lookup in this case and in case this causes a successful connection
@@ -268,7 +267,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          https://svn.apache.org/r1875355
       Backport version for 2.4.x of patch:
          svn merge -c 1875355 ^/httpd/httpd/trunk .
-      +1: gbechis
+      +1: gbechis, icing
    
     *) mod_rewrite: PR66672 trailing ? and QSA together regression
       Trunk version of patch: