ipromote

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

diff --git a/STATUS b/STATUS
index b440a71592e8fa7ee237714954c8d7fed7f36890..21c28219a1d1355d6b5ac2b07b2f099c1fb4838b 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -115,7 +115,28 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
                  http://svn.apache.org/viewvc?view=revision&revision=1464675
     2.4.x patch: trunk patchs work
     +1: jailletc36, rjung, covener
-   
+
+  * ap_expr: Expression parser: Add the ability to apply a SHA1 hash to
+    strings within the parser.
+    trunk patch: http://svn.apache.org/r1457450
+                 http://svn.apache.org/r1457610
+                 http://svn.apache.org/r1457995
+                 http://svn.apache.org/r1458003
+    2.4.x patch: trunk patch applies.
+    +1: minfrin, rjung, jim
+
+   * remove useless tests ==> (*x && apr_isspace(*x))
+     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1452128
+     2.4.x patch: trunk patch works (with some offset)
+     +1: jailletc36, rjung, covener
+
+   * mod_log_config: Fix crash when logging request end time for a failed request.
+     PR 54828
+     trunk patch: http://svn.apache.org/r1467765
+     2.4.x patch: trunk patchs applies
+     +1: rjung, covener, jim
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -195,15 +216,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                  for testing on Windows too, and if there same issues I will
                  asap post them to list (or turn my -1 to +1) ... 
 
-  * ap_expr: Expression parser: Add the ability to apply a SHA1 hash to
-    strings within the parser.
-    trunk patch: http://svn.apache.org/r1457450
-                 http://svn.apache.org/r1457610
-                 http://svn.apache.org/r1457995
-                 http://svn.apache.org/r1458003
-    2.4.x patch: trunk patch applies.
-    +1: minfrin, rjung, jim
-
   * mod_auth_basic: Add a generic mechanism to fake basic authentication
     using the ap_expr parser. This allows the administrator to construct
     their own username and password for basic authentication based on their
@@ -238,11 +250,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.2.x patch: http://people.apache.org/~druggeri/patches/httpd-2.2.x-failontimeout.patch
      +1: druggeri
 
-   * remove useless tests ==> (*x && apr_isspace(*x))
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1452128
-     2.4.x patch: trunk patch works (with some offset)
-     +1: jailletc36, rjung, covener
-
    * tune ap_escape_logitem to avoid waste of memory
      trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1461869
      2.4.x patch: trunk patch works (with some offset)
@@ -260,12 +267,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.2.x patch: https://people.apache.org/~kbrand/PR52212_54698_2.2.x.patch
     +1: kbrand, jorton, 
 
-   * mod_log_config: Fix crash when logging request end time for a failed request.
-     PR 54828
-     trunk patch: http://svn.apache.org/r1467765
-     2.4.x patch: trunk patchs applies
-     +1: rjung, covener, jim
-
    * ap_expr: Expression parser: Add the ability to apply a md5 hash to
      strings within the parser.
      trunk patch: http://svn.apache.org/r1457450