]> granicus.if.org Git - apache/commitdiff
Propose fix for PR 61142
authorJean-Frederic Clere <jfclere@apache.org>
Tue, 11 Jul 2017 12:15:34 +0000 (12:15 +0000)
committerJean-Frederic Clere <jfclere@apache.org>
Tue, 11 Jul 2017 12:15:34 +0000 (12:15 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1801602 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index f14fff5fee531b031e9a174c962df53fe926288c..b8331a16a388a2119411633aef339439d1d8ab42 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -212,6 +212,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   https://svn.apache.org/r1793923
      2.4.x patch: svn merge -r1793921:HEAD ^/httpd/httpd/branches/trunk-override-index
      +1: jchampion
+
+  *) mod_proxy_wstunnel fix PR 61142
+     2.4.x patch: svn merge -c 1801594 ^/httpd/httpd/trunk .
+     +1: jfclere
      
 
 PATCHES/ISSUES THAT ARE BEING WORKED