From: Jim Jagielski <jim@apache.org>
Date: Tue, 8 Jul 2014 13:11:54 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.10~72
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed416b70f9447483dd59d71e66b60930b152476b;p=apache

promote


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

diff --git a/STATUS b/STATUS
index e89142569b..60a5e55fae 100644
--- a/STATUS
+++ b/STATUS
@@ -118,6 +118,25 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: https://people.apache.org/~ylavic/httpd-2.4.x-SSLOCSPUseRequestNonce+manual-2.4.10-v2.patch
      +1: ylavic, kbrand, jorton
 
+   * mod_proxy_http: Avoid useless functions calls.
+     trunk patch: http://svn.apache.org/r1572561
+     2.4.x patch: trunk works
+     +1: ylavic, covener, jim
+
+   * mod_proxy: When ping/pong is configured for a worker, don't send or forward
+                "100 Continue" (interim) response to the client if it does not
+                expect one.
+     trunk patch: http://svn.apache.org/r1588519
+     2.4.x patch: trunk works (modulo CHANGES)
+     +1: ylavic, covener, jim
+
+   * mod_ssl: Improve compatibility with mod_nss; allow "SSLEngine off" to override
+              Listen-based default.
+     trunk patch: http://svn.apache.org/r1537535
+     2.4.x patch: trunk patch works
+     +1: jorton, trawick, , jim
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -147,18 +166,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              https://issues.apache.org/bugzilla/attachment.cgi?id=31686).
              Should we?
 
-   * mod_proxy_http: Avoid useless functions calls.
-     trunk patch: http://svn.apache.org/r1572561
-     2.4.x patch: trunk works
-     +1: ylavic, covener, jim
-
-   * mod_proxy: When ping/pong is configured for a worker, don't send or forward
-                "100 Continue" (interim) response to the client if it does not
-                expect one.
-     trunk patch: http://svn.apache.org/r1588519
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: ylavic, covener, jim
-
    * mod_proxy: Preserve original request headers even if they differ
                 from the ones to be forwarded to the backend. PR 45387.
      trunk patch: http://svn.apache.org/r1588527
@@ -205,12 +212,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-ldap-connttl-conservative.diff
      +1 covener, jim
 
-   * mod_ssl: Improve compatibility with mod_nss; allow "SSLEngine off" to override
-              Listen-based default.
-     trunk patch: http://svn.apache.org/r1537535
-     2.4.x patch: trunk patch works
-     +1: jorton, trawick, , jim
-
    * mod_ssl: Fix tmp DH parameter leak, adjust selection to prefer
               larger keys and support up to 8192-bit keys.
      trunk patch: http://svn.apache.org/r1597349