From: Stefan Eissing <icing@apache.org>
Date: Thu, 19 Nov 2015 16:10:37 +0000 (+0000)
Subject: updated after incorporating change by ylavic
X-Git-Tag: 2.4.18~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cd77c8f5c3782ebabdf561372265f832e0f58fc;p=thirdparty%2Fapache%2Fhttpd.git

updated after incorporating change by ylavic

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

diff --git a/STATUS b/STATUS
index 75e9e8e0767..a24c5b3c62d 100644
--- a/STATUS
+++ b/STATUS
@@ -167,11 +167,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1710419
                   http://svn.apache.org/r1710572
                   http://svn.apache.org/r1710583
+                  http://svn.apache.org/r1715023
                   + manual addition of "conn_rec *master;"
-     2.4.x patch: https://raw.githubusercontent.com/icing/mod_h2/master/sandbox/httpd/patches/2.4.17-protocols.patch
      branch mergeable to 2.4.x: ^/httpd/httpd/branches/2.4.17-protocols-changes
-     +1: icing, jim
-     ylavic: +1 with r1715023.
+     +1: icing, ylavic
+     before adding r1715023, jim was +1, retest?
 
   *) mod_ssl: For the "SSLStaplingReturnResponderErrors off" case, make sure
               to only staple responses with certificate status "good"