Vote x3, propose x1, note: CMake changes should be CTR.

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

diff --git a/STATUS b/STATUS
index 2518e17b11e6e6bc54edb76b2bfc6611f7c3ce28..3117ec11e5dff810a084df80ae8cea1777db5f02 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -183,6 +183,35 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1 covener, rpluem, steffenal
 
 
+  *) mod_rewrite: don't merge leading slashes when they come from a perdir prefix
+     (rather than the substitution)
+     Trunk version of patch:
+        https://svn.apache.org/r1919860
+     Backport version for 2.4.x of patch:
+       https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/473.diff
+     Can be applied via apply_backport_pr.sh 473
+     +1: covener, rpluem, jorton
+
+  *) mod_http: Trust content-type values set from configuration
+     r1918823 takes care of the content-type fix, while r1427465
+     is backported to avoid a conflict. It removes support for Request-Range
+     header sent by Navigator 2-3 and MSIE 3.
+     Trunk version of patch:
+        https://svn.apache.org/r1427465
+        https://svn.apache.org/r1918823
+     Backport version for 2.4.x of patch:
+       https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/475.diff
+     Can be applied via apply_backport_pr.sh 475
+     +1: rpluem, covener, jorton
+
+  *) mod_rewrite: Improve safe question mark detection
+     Trunk version of patch:
+        https://svn.apache.org/r1920566
+     Backport version for 2.4.x of patch:
+      Trunk version of patch works
+      svn merge -c 1920566 ^/httpd/httpd/trunk .
+     +1: rpluem, covener, jorton
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -231,35 +260,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   https://svn.apache.org/r1919602
      2.4.x patch: svn merge -c r1919413 -c r1919587 -c r1919602 ^/httpd/httpd/trunk .
      +1: ivan
+     +0: jorton - falls under RTC exception for "non-Unix build" 
 
-  *) mod_rewrite: don't merge leading slashes when they come from a perdir prefix
-     (rather than the substitution)
-     Trunk version of patch:
-        https://svn.apache.org/r1919860
-     Backport version for 2.4.x of patch:
-       https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/473.diff
-     Can be applied via apply_backport_pr.sh 473
-     +1: covener, rpluem
-
-  *) mod_http: Trust content-type values set from configuration
-     r1918823 takes care of the content-type fix, while r1427465
-     is backported to avoid a conflict. It removes support for Request-Range
-     header sent by Navigator 2-3 and MSIE 3.
-     Trunk version of patch:
-        https://svn.apache.org/r1427465
-        https://svn.apache.org/r1918823
-     Backport version for 2.4.x of patch:
-       https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/475.diff
-     Can be applied via apply_backport_pr.sh 475
-     +1: rpluem, covener
-
-  *) mod_rewrite: Improve safe question mark detection
-     Trunk version of patch:
-        https://svn.apache.org/r1920566
-     Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1920566 ^/httpd/httpd/trunk .
-     +1: rpluem, covener
+  *) mod_ssl: Fix regression in PKCS#11 handling which should work without
+     SSLCryptoDevice configured
+     trunk patch: https://svn.apache.org/r1920597
+     2.4.x patch: svn merge -c 1920597 ^/httpd/httpd/trunk .
+     +1: jorton, 
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]