From: Jim Jagielski <jim@apache.org>
Date: Wed, 10 Oct 2018 15:35:03 +0000 (+0000)
Subject: approved backports
X-Git-Tag: 2.4.36~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c50deca5896da13c35b73708487c427f876ba94a;p=thirdparty%2Fapache%2Fhttpd.git

approved backports



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

diff --git a/STATUS b/STATUS
index 2b0adbf8061..622113300ad 100644
--- a/STATUS
+++ b/STATUS
@@ -124,6 +124,30 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_brotli, mod_deflate: Restore the separate handling of 304 Not Modified
+     responses allowing these modules to properly set or fix-up the response
+     headers such as Vary or ETag. Fixes a potential violation of RFC7232, 4.1.
+     Regression introduced in 2.4.35.
+     trunk patch: https://svn.apache.org/r1843242
+     2.4.x patch: svn merge -c 1843242 ^/httpd/httpd/trunk .
+     Note: The related discussion is in
+       https://lists.apache.org/thread.html/f5733ca6743757e8aa8b58a0cd9e27680971551c2a20f5606c66507e@%3Cdev.httpd.apache.org%3E
+     Note: Presumably, this needs a separate CHANGES entry that is not included
+     in the 2.4.x patch.
+     +1: kotkov, ylavic, jim
+
+  *) mod_proxy_scgi, mod_proxy_uwsgi: These need to be signed longs otherwise,
+     the error handling code can never trigger.
+     trunk patch: http://svn.apache.org/r1839303
+                  http://svn.apache.org/r1843290 (CHANGES entry)
+     2.4.x patch: svn merge -c 1839303,1843290 ^/httpd/httpd/trunk . 
+     +1: jailletc36 (by inspection), ylavic, jim
+
+  *) mod_http2: fixing an issue that h2 stream do not properly EOS when
+     the bucket is missing in the handler response.
+     trunk patch: http://svn.apache.org/r1843426
+     2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/h2-eos-fix.patch
+     +1: icing, ylavic, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -176,31 +200,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: http://home.apache.org/~jim/patches/socache_redisv2.patch
       +1: jim, minfrin
 
-  *) mod_brotli, mod_deflate: Restore the separate handling of 304 Not Modified
-     responses allowing these modules to properly set or fix-up the response
-     headers such as Vary or ETag. Fixes a potential violation of RFC7232, 4.1.
-     Regression introduced in 2.4.35.
-     trunk patch: https://svn.apache.org/r1843242
-     2.4.x patch: svn merge -c 1843242 ^/httpd/httpd/trunk .
-     Note: The related discussion is in
-       https://lists.apache.org/thread.html/f5733ca6743757e8aa8b58a0cd9e27680971551c2a20f5606c66507e@%3Cdev.httpd.apache.org%3E
-     Note: Presumably, this needs a separate CHANGES entry that is not included
-     in the 2.4.x patch.
-     +1: kotkov, ylavic, jim
-
-  *) mod_proxy_scgi, mod_proxy_uwsgi: These need to be signed longs otherwise,
-     the error handling code can never trigger.
-     trunk patch: http://svn.apache.org/r1839303
-                  http://svn.apache.org/r1843290 (CHANGES entry)
-     2.4.x patch: svn merge -c 1839303,1843290 ^/httpd/httpd/trunk . 
-     +1: jailletc36 (by inspection), ylavic, jim
-
-  *) mod_http2: fixing an issue that h2 stream do not properly EOS when
-     the bucket is missing in the handler response.
-     trunk patch: http://svn.apache.org/r1843426
-     2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/h2-eos-fix.patch
-     +1: icing, ylavic, jim
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]