vote/promote

[skip ci]

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

diff --git a/STATUS b/STATUS
index e9baa958819cd5402010a7157797c241dffc9588..10277f3a1434907ffdb2affd3b0f73b084c3e144 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -179,6 +179,52 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
              Proposed for backport below, in place of or after this one.
      rpluem: +1 on PR 289 as well.
 
+  *) Support PCRE2 with buffers reuse through Thread Local Storage.
+     trunk patches:
+         http://svn.apache.org/r1897240
+         http://svn.apache.org/r1897241
+         http://svn.apache.org/r1897242
+         http://svn.apache.org/r1897244
+         http://svn.apache.org/r1897248
+         http://svn.apache.org/r1897250
+         http://svn.apache.org/r1897260
+         http://svn.apache.org/r1897261
+         http://svn.apache.org/r1897263
+         http://svn.apache.org/r1897386
+         http://svn.apache.org/r1897459
+         http://svn.apache.org/r1897460
+         http://svn.apache.org/r1897461
+         http://svn.apache.org/r1897462
+         http://svn.apache.org/r1897472
+         http://svn.apache.org/r1897543
+         http://svn.apache.org/r1612934
+         http://svn.apache.org/r1612940
+         http://svn.apache.org/r1613189
+         http://svn.apache.org/r1897651
+         http://svn.apache.org/r1897680
+         http://svn.apache.org/r1897689
+         http://svn.apache.org/r1897691
+         http://svn.apache.org/r1897692
+     2.4.x patches:
+         https://github.com/apache/httpd/pull/289.diff
+         (PR: https://github.com/apache/httpd/pull/289)
+     +1: ylavic, rpluem, covener
+     ylavic: This backport proposal inludes the PCRE2 backport already accepted,
+             we can apply this one instead or the original one first and then
+             this one (I'd have to rebase the github PR first).
+     ylavic: Can someone test this on Windows too?
+
+
+  *) Add the ldap function to the expression API, allowing LDAP filters and
+     distinguished names based on expressions to be escaped correctly to
+     guard against LDAP injection.
+     Trunk version of patch:
+        https://svn.apache.org/r1589986
+        https://svn.apache.org/r1589995
+        https://svn.apache.org/r1633528
+     Backport version for 2.4.x of patch:
+        https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-ldap-expr.patch
+     +1: minfrin, icing, covener
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -194,17 +240,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      jailletc36: part of r1891023 is needed to fill some APLOGNO()
      icing: seems there is some potential to wrap this into a common function?
 
-  *) Add the ldap function to the expression API, allowing LDAP filters and
-     distinguished names based on expressions to be escaped correctly to
-     guard against LDAP injection.
-     Trunk version of patch:
-        https://svn.apache.org/r1589986
-        https://svn.apache.org/r1589995
-        https://svn.apache.org/r1633528
-     Backport version for 2.4.x of patch:
-        https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-ldap-expr.patch
-     +1: minfrin, icing
-
   *) Add the ldap-search option to mod_authnz_ldap, allowing authorization
      to be based on arbitrary expressions that do not include the username.
      Make sure that when ldap searches are too long, we explicitly log the
@@ -226,41 +261,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-authn-expr.patch
      +1: minfrin
 
-  *) Support PCRE2 with buffers reuse through Thread Local Storage.
-     trunk patches:
-         http://svn.apache.org/r1897240
-         http://svn.apache.org/r1897241
-         http://svn.apache.org/r1897242
-         http://svn.apache.org/r1897244
-         http://svn.apache.org/r1897248
-         http://svn.apache.org/r1897250
-         http://svn.apache.org/r1897260
-         http://svn.apache.org/r1897261
-         http://svn.apache.org/r1897263
-         http://svn.apache.org/r1897386
-         http://svn.apache.org/r1897459
-         http://svn.apache.org/r1897460
-         http://svn.apache.org/r1897461
-         http://svn.apache.org/r1897462
-         http://svn.apache.org/r1897472
-         http://svn.apache.org/r1897543
-         http://svn.apache.org/r1612934
-         http://svn.apache.org/r1612940
-         http://svn.apache.org/r1613189
-         http://svn.apache.org/r1897651
-         http://svn.apache.org/r1897680
-         http://svn.apache.org/r1897689
-         http://svn.apache.org/r1897691
-         http://svn.apache.org/r1897692
-     2.4.x patches:
-         https://github.com/apache/httpd/pull/289.diff
-         (PR: https://github.com/apache/httpd/pull/289)
-     +1: ylavic, rpluem,
-     ylavic: This backport proposal inludes the PCRE2 backport already accepted,
-             we can apply this one instead or the original one first and then
-             this one (I'd have to rebase the github PR first).
-     ylavic: Can someone test this on Windows too?
-
   *) mod_proxy: Bump shared worker name to 384 chars. PR 53218
      trunk patch: http://svn.apache.org/r1896253
                   http://svn.apache.org/r1897859 (CHANGES entry, not in patch)