You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by co...@apache.org on 2017/05/30 13:44:20 UTC

svn commit: r1796866 - /httpd/httpd/branches/2.4.x/STATUS

Author: covener
Date: Tue May 30 13:44:20 2017
New Revision: 1796866

URL: http://svn.apache.org/viewvc?rev=1796866&view=rev
Log:
propose jfclere's issue


Modified:
    httpd/httpd/branches/2.4.x/STATUS

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1796866&r1=1796865&r2=1796866&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue May 30 13:44:20 2017
@@ -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 ]