From: Eric Covener <covener@apache.org>
Date: Tue, 30 May 2017 13:44:20 +0000 (+0000)
Subject: propose jfclere's issue
X-Git-Tag: 2.4.26~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5fbe037dade74a5e561ee8d3e6fe38c4f2df3aac;p=apache

propose jfclere's issue



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

diff --git a/STATUS b/STATUS
index 87abfa95d8..54238a542c 100644
--- a/STATUS
+++ b/STATUS
@@ -192,10 +192,18 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) MPMs unix: Place signals handlers and helpers out of DSOs to avoid a
      possible crash if a signal is caught during (graceful) restart. PR 60487.
      trunk patch: http://svn.apache.org/r1783849
-     2.4.x patch: svn merge -c 1783849 ^/httpd/httpd/trunk
+     2.4.x patch: svn merge -c 1783849 ^/httpd/httpd/trunk .
                   (trunk works, modulo CHANGES)
      +1: ylavic
 
+  *) proxy_wstunnel: Restore ability to process other Upgrade: protocols which was
+     blocked in r1674632/r1674661.
+     trunk patch: http://svn.apache.org/r1792092
+                  http://svn.apache.org/r1796864
+     2.4.x patch: svn merge -c  1792092,1796864 ^/httpd/httpd/trunk .
+     +1: covener
+
+
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entried should be added at the START of the list ]