From a10f8567a619e323e0f0cc47067dd1f0d841e246 Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Mon, 6 Nov 2017 15:08:27 +0000 Subject: [PATCH] promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1814418 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/STATUS b/STATUS index 35ed6e49d9..e99ac95a8b 100644 --- a/STATUS +++ b/STATUS @@ -132,6 +132,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x: svn merge -c 1811744 ^/httpd/httpd/trunk . +1: elukey, icing, ylavic + *) mod_http2: avoid unnecessary data retrieval for a trace log. Allow certain + information retrievals on null bucket beams where it makes sense. + trunk patch: https://svn.apache.org/r1813767 + 2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/mod_http2_v1.10.13.diff + +1: icing, ylavic, steffenal + PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -233,12 +239,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: svn merge -c 1813643 ^/httpd/httpd/trunk . +1: ylavic, icing - *) mod_http2: avoid unnecessary data retrieval for a trace log. Allow certain - information retrievals on null bucket beams where it makes sense. - trunk patch: https://svn.apache.org/r1813767 - 2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/mod_http2_v1.10.13.diff - +1: icing, ylavic, steffenal - *) ab: Make the TLS layer aware that the underlying socket is nonblocking, and use/handle POLLOUT where needed to avoid busy IOs and recover write errors when appropriate. -- 2.40.0