From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 2 Jun 2017 23:24:56 +0000 (+0000)
Subject: Vote (+promote), comment.
X-Git-Tag: 2.4.26~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee66570028d11ca435f0977c25fd051cc37433a6;p=thirdparty%2Fapache%2Fhttpd.git

Vote (+promote), comment.

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

diff --git a/STATUS b/STATUS
index d48ba5655f3..ec801068917 100644
--- a/STATUS
+++ b/STATUS
@@ -120,6 +120,13 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) 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, jim, ylavic
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -187,18 +194,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-mpm_event-wakeup-v7.1.patch
      +1: ylavic, icing
 
-  *) 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, jim
-
   *) worker, prefork: save some cycles by not copying the listener's pollfds
                       for each pollset operation
      trunk patch: http://svn.apache.org/r1662437
      2.4.x patch: svn merge -c 1662437 ^/httpd/httpd/trunk .
-     +1: jailletc36
+     +1: jailletc36, ylavic
 
    *) prefork: This fixes race-condition in signals handling when httpd is
                runnning on foreground and user hits ctrl+c
@@ -209,6 +209,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                 the patch description looks straighforward.
                 If confirmed, it would worth, IMHO, a CHANGE entry and maybe a
                 2.2.x backport.
+	    ylavic: Not needed (in 2.4.x) since recent r1797368.
 
 
 PATCHES/ISSUES THAT ARE BEING WORKED