vote, note, promote

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

diff --git a/STATUS b/STATUS
index 55965599cec472a4c09ef32bc79c796287608d11..43c6ceb123ad70e1fe48e7ce65fedc6be2227927 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -98,7 +98,25 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-
+  * Easy proposals, synch 2.4 and trunk:
+      mod_dav: Style, indentation. No functional change.
+      mod_dav: Add missing break in 'dav_generic_do_refresh' to avoid useless computation
+      mod_dav: Add missing break in 'dav_fs_do_refresh' to avoid useless computation
+      mod_macro: Allocate correct size for the array to avoid useless memory allocation and copy
+      mod_proxy: Add missing break.
+      mod_proxy: oops (fix r1556912)
+      server/regex: No need to test for NULL, apr_pstrndup already handles it.
+      various: Remove some useless declarations that were shadowing other local variables of the same name.
+    trunk patches: http://svn.apache.org/r1557317
+                   http://svn.apache.org/r1556911
+                   http://svn.apache.org/r1556914
+                   http://svn.apache.org/r1555259
+                   http://svn.apache.org/r1556912
+                   http://svn.apache.org/r1556937
+                   http://svn.apache.org/r1559351
+                   http://svn.apache.org/r1463046
+     2.4.x patch: http://people.apache.org/~jailletc36/backport6.patch
+     +1: jailletc36, jim, trawick
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -151,12 +169,14 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                 http://svn.apache.org/r1557640
     2.4.x patch: http://people.apache.org/~covener/patches/2.4.x-moddir-skiphandler.diff
     +1: covener, jim
-    (I could be convincd to flip the default here, but I think it's too late)
+    (I could be convinced to flip the default here, but I think it's too late)
 
    * mod_rewrite: Don't loop forever if the [N] flag isn't making progress.
      trunk patch http://svn.apache.org/r1556206
      2.4.x patch: trunk works
      +1: covener, jim
+     trawick: can you clarify here the plan for "If backported, probably increase
+              the hard-coded limit to 32k from 10k."?
 
    * mod_slotmem_shm: Remove wonky and dangerous code that knows about APR
      internals. We work fine w/o it anyway at this stage.
@@ -176,26 +196,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://people.apache.org/~jim/patches/uds-rewrite.patch
      +1: jim
 
-  * Easy proposals, synch 2.4 and trunk:
-      mod_dav: Style, indentation. No functional change.
-      mod_dav: Add missing break in 'dav_generic_do_refresh' to avoid useless computation
-      mod_dav: Add missing break in 'dav_fs_do_refresh' to avoid useless computation
-      mod_macro: Allocate correct size for the array to avoid useless memory allocation and copy
-      mod_proxy: Add missing break.
-      mod_proxy: oops (fix r1556912)
-      server/regex: No need to test for NULL, apr_pstrndup already handles it.
-      various: Remove some useless declarations that were shadowing other local variables of the same name.
-    trunk patches: http://svn.apache.org/r1557317
-                   http://svn.apache.org/r1556911
-                   http://svn.apache.org/r1556914
-                   http://svn.apache.org/r1555259
-                   http://svn.apache.org/r1556912
-                   http://svn.apache.org/r1556937
-                   http://svn.apache.org/r1559351
-                   http://svn.apache.org/r1463046
-     2.4.x patch: http://people.apache.org/~jailletc36/backport6.patch
-     +1: jailletc36, jim
-
 OTHER PROPOSALS
 
    * A list of further possible backports can be found at: