From: Jeff Trawick <trawick@apache.org>
Date: Wed, 15 Apr 2015 14:05:52 +0000 (+0000)
Subject: quid
X-Git-Tag: 2.4.13~248
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80a065c841d2d9e2e30408b24e4b3757406e860a;p=thirdparty%2Fapache%2Fhttpd.git

quid

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

diff --git a/STATUS b/STATUS
index f16529be5af..b0fc26a1049 100644
--- a/STATUS
+++ b/STATUS
@@ -126,6 +126,18 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch:  trunk works (modulo CHANGES)
      +1: covener, trawick, ylavic
 
+  *) mod_proxy_wstunnel: Avoid an empty response by failing with 502 (Bad
+     Gateway) when no response is ever received from the backend.
+     trunk patch: http://svn.apache.org/r1669299
+     2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-wstunel-noreply.diff 
+     +1 covener, ylavic, trawick
+
+  *) mod_ssl: Fix possible crash when loading server certificate constraints.
+     PR 57694.
+     trunk patch: http://svn.apache.org/r1666297
+     2.4.x patch: trunk works (modulo CHANGES)
+     +1: ylavic, rjung, trawick
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -270,12 +282,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: ylavic
 
-  *) mod_ssl: Fix possible crash when loading server certificate constraints.
-     PR 57694.
-     trunk patch: http://svn.apache.org/r1666297
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: ylavic, rjung
-
   *) core: Add CGIPassAuth directive to control whether HTTP authorization
      headers are passed to scripts as CGI variables.  PR: 56855
      trunk patch: http://svn.apache.org/r1642847, http://svn.apache.org/r1673155
@@ -311,6 +317,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1672989 (CHANGES)
      2.4.x patch: trunk works (modulo CHANGES)
      +1: jailletc36, ylavic
+     trawick: Could we add r1673769 too?
 
   *) mod_logio: Log time-to-first-byte via %^FB
      trunk patch: http://svn.apache.org/r1671918
@@ -318,12 +325,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: covener, ylavic
 
-  *) mod_proxy_wstunnel: Avoid an empty response by failing with 502 (Bad
-     Gateway) when no response is ever received from the backend.
-     trunk patch: http://svn.apache.org/r1669299
-     2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-wstunel-noreply.diff 
-     +1 covener, ylavic
-
 OTHER PROPOSALS
 
    * A list of further possible backports can be found at: