]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
* Vote and promote [skip ci]
authorRuediger Pluem <rpluem@apache.org>
Mon, 17 Aug 2020 13:37:54 +0000 (13:37 +0000)
committerRuediger Pluem <rpluem@apache.org>
Mon, 17 Aug 2020 13:37:54 +0000 (13:37 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1880929 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 4c309b9e11017c46f24dacbd629c77cf6b17faae..3deaf99caf7aeff1b0582827560e4aaf7e1bb93a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -145,6 +145,15 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1 rjung, jim, rpluem
      -1 
 
+  *) mod_proxy: Add proxy check_trans() hook and allow mod_proxy_wtunnel
+     to step out of the way of mod_proxy_http.
+     i.e.
+
+     trunk patch: http://svn.apache.org/r1869399
+                  http://svn.apache.org/r1776290
+     2.4.x patch: http://people.apache.org/~covener/patches/wstunnel-decline.diff
+     +1 covener, jim, rpluem
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -215,15 +224,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge --accept tf -c 1870095,1870097,1880927 ^/httpd/httpd/trunk .
      +1: jorton, 
 
-  *) mod_proxy: Add proxy check_trans() hook and allow mod_proxy_wtunnel
-     to step out of the way of mod_proxy_http.
-     i.e.
-
-     trunk patch: http://svn.apache.org/r1869399
-                  http://svn.apache.org/r1776290
-     2.4.x patch: http://people.apache.org/~covener/patches/wstunnel-decline.diff
-     +1 covener, jim
-
   *)  mpm_event: reset listener_is_wakeable on reload.
      trunk patch: http://svn.apache.org/r1877552
      2.4.x patch: svn merge -c 1877552 ^/httpd/httpd/trunk .