Promote

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

diff --git a/STATUS b/STATUS
index 6e09b67ea693cf6a9024ed277d54d975289903a8..7f63528114c4e633a8a5c0818632b87e70b70d94 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -93,6 +93,45 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk patch works
      +1: rjung, humbedooh, trawick (needs CHANGES entry)
 
+   * mod_auth_digest: respect DefaultRuntimeDir for its
+                      unconfigurable shared memory file
+     trunk patch: http://svn.apache.org/viewvc?rev=1371387&view=rev
+     2.4.x patch: trunk patch works
+     +1: trawick, rjung, jim
+
+   * ab fixes:
+     o When -B is specified, search for a host address in the same
+       family as the specified outbound interface.
+     o Fix read failure when targeting SSL server.
+     trunk patches: http://svn.apache.org/viewvc?view=revision&revision=1364133
+                    http://svn.apache.org/viewvc?view=revision&revision=1371791
+     2.4.x patch: trunk patches work
+     +1: trawick, rjung, jim
+
+   * httpd.conf.in: remove DNT header field from MSIE 10.0 requests because
+       the browser is deliberately violating the standard under development.
+     trunk patch: http://svn.apache.org/viewvc?rev=1371878&view=rev
+     2.4.x patch: trunk patch works
+       +1: fielding, gstein, jim
+       rjung: What about not needing mod_setenvif:
+     RequestHeader unset DNT "expr=%{HTTP_USER_AGENT} -strmatch '*MSIE 10.0;*'"
+         -- fielding: I prefer the separate syntax.  I want the env variable
+               to be set for apps/logging, and it allows the same treatment
+               to be applied to other user agents that go bad.
+
+   * Correctly log the error returned by apr_dbd_pvselect().
+     trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1364229
+     2.4.x patch: trunk patch works
+     +1: rjung, trawick, jim
+
+   * Various code clean up.
+     Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>
+     PR: 52893
+     trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1361801
+     2.4.x patch: trunk patch works, except for mod_policy (ignore)
+     +1: rjung, trawick, jim
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -155,21 +194,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      humbedooh: It's in the 2.4 docs already, but commented out, as with a lot 
                 of other functions that were never actually made. It's a mess ;)
 
-   * mod_auth_digest: respect DefaultRuntimeDir for its
-                      unconfigurable shared memory file
-     trunk patch: http://svn.apache.org/viewvc?rev=1371387&view=rev
-     2.4.x patch: trunk patch works
-     +1: trawick, rjung, jim
-
-   * ab fixes:
-     o When -B is specified, search for a host address in the same
-       family as the specified outbound interface.
-     o Fix read failure when targeting SSL server.
-     trunk patches: http://svn.apache.org/viewvc?view=revision&revision=1364133
-                    http://svn.apache.org/viewvc?view=revision&revision=1371791
-     2.4.x patch: trunk patches work
-     +1: trawick, rjung, jim
-
    * PR 52476: SSL failures on Windows with AcceptFilter https none
      trunk patch: http://svn.apache.org/viewvc?rev=1371801&view=rev
      2.4.x patch: trunk patch works
@@ -195,22 +219,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
           mod_slotmem_plain  r1370763
           mod_ldap           r1371684
 
-   * httpd.conf.in: remove DNT header field from MSIE 10.0 requests because
-       the browser is deliberately violating the standard under development.
-     trunk patch: http://svn.apache.org/viewvc?rev=1371878&view=rev
-     2.4.x patch: trunk patch works
-       +1: fielding, gstein, jim
-       rjung: What about not needing mod_setenvif:
-     RequestHeader unset DNT "expr=%{HTTP_USER_AGENT} -strmatch '*MSIE 10.0;*'"
-         -- fielding: I prefer the separate syntax.  I want the env variable
-               to be set for apps/logging, and it allows the same treatment
-               to be applied to other user agents that go bad.
-
-   * Correctly log the error returned by apr_dbd_pvselect().
-     trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1364229
-     2.4.x patch: trunk patch works
-     +1: rjung, trawick, jim
-
    * mpm_winnt: initialize the protocol field when manufacturing an apr socket
      lest accidential autodata contents leak into the apr_socket_t.
      (this doesn't address any known problem symptom)
@@ -218,13 +226,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk patch works
      +1: rjung, trawick
 
-   * Various code clean up.
-     Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>
-     PR: 52893
-     trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1361801
-     2.4.x patch: trunk patch works, except for mod_policy (ignore)
-     +1: rjung, trawick, jim
-
    * core: make ap_parse_form_data less strict when checking for a correct 
            Content-Type header when parsing POST, or we risk losing valid 
            data with an appended charset.