From: William A. Rowe Jr Date: Wed, 31 May 2017 01:36:10 +0000 (+0000) Subject: Good catch X-Git-Tag: 2.4.26~46 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fae33809373350304ad68eeef4609b0c62e6ed8;p=thirdparty%2Fapache%2Fhttpd.git Good catch git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1796965 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 0a57f09cfdf..9181960636e 100644 --- a/STATUS +++ b/STATUS @@ -194,7 +194,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: trunk patch: http://svn.apache.org/r1783849 2.4.x patch: svn merge -c 1783849 ^/httpd/httpd/trunk . (trunk works, modulo CHANGES) - +1: ylavic + +1: ylavic, wrowe *) proxy_wstunnel: Restore ability to process other Upgrade: protocols which was blocked in r1674632/r1674661.