promote

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

diff --git a/STATUS b/STATUS
index d892657afdd29df36b4737377496b50acfa3fab7..6d4e7dfbbdee35c35df51b7b23e7de5bf2937ac0 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -88,6 +88,34 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * mod_lua: - Add a parsebody function for retrieving POST data. PR: 53064
+              - Make mod_lua compatible with Lua 5.2
+     Trunk patch:
+       http://svn.apache.org/viewvc?view=revision&revision=1352047 and
+       http://svn.apache.org/viewvc?view=revision&revision=1361298
+     2.4.x patch:
+       http://www.humbedooh.com/mods/mod_lua.patch (+CHANGES)
+     +1: humbedooh, rjung, jim
+
+   * apxs: Make apxs use LDFLAGS from config_vars.mk in addition to
+     CFLAGS and CPPFLAGS.
+     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1343094
+     2.4.x patch: trunk patch works
+     +1: rjung, humbedooh, jim
+     rjung: sf: you applied it to trunk, care to vote?
+
+   * .gdbinit: improve dump_allocator, add dump_one_pool.
+     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1352909
+     2.4.x patch: trunk patch works
+     +1: rjung, jorton, jim
+     rjung: sf: you applied it to trunk, care to vote?
+
+   * htpasswd: Note more prominently that SHA and crypt are insecure.
+     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1352910
+     2.4.x patch: trunk patch works
+     +1: rjung, humbedooh, jim
+     rjung: sf: you applied it to trunk, care to vote?
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -116,40 +144,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
           any version. Also, if you read my note to dev@ you will see
           why it is not premature.
 
-   * mod_lua: - Add a parsebody function for retrieving POST data. PR: 53064
-              - Make mod_lua compatible with Lua 5.2
-     Trunk patch:
-       http://svn.apache.org/viewvc?view=revision&revision=1352047 and
-       http://svn.apache.org/viewvc?view=revision&revision=1361298
-     2.4.x patch:
-       http://www.humbedooh.com/mods/mod_lua.patch (+CHANGES)
-     +1: humbedooh, rjung, jim
-
-   * apxs: Make apxs use LDFLAGS from config_vars.mk in addition to
-     CFLAGS and CPPFLAGS.
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1343094
-     2.4.x patch: trunk patch works
-     +1: rjung, humbedooh, jim
-     rjung: sf: you applied it to trunk, care to vote?
-
-   * .gdbinit: improve dump_allocator, add dump_one_pool.
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1352909
-     2.4.x patch: trunk patch works
-     +1: rjung, jorton, jim
-     rjung: sf: you applied it to trunk, care to vote?
-
    * scoreboard: Add the port number to the vhost's name.
      trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1294358
      2.4.x patch: trunk patch works
      +1: rjung, jim
      rjung: sf: you applied it to trunk, care to vote?
 
-   * htpasswd: Note more prominently that SHA and crypt are insecure.
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1352910
-     2.4.x patch: trunk patch works
-     +1: rjung, humbedooh, jim
-     rjung: sf: you applied it to trunk, care to vote?
-
    * mod_setenvif: Compile the regex used by is_header_regex() only once
      during startup This should save some memory, especially with .htaccess
      trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1343099