From a6c1cc8881da92db27d22f9d3b3846798fb1a49f Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Tue, 7 Nov 2017 08:58:03 +0000 Subject: [PATCH] vote and promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1814466 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/STATUS b/STATUS index 0b5d67b89b..ab6e1ede32 100644 --- a/STATUS +++ b/STATUS @@ -132,6 +132,15 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x: svn merge -c 1811744 ^/httpd/httpd/trunk . +1: elukey, icing, ylavic + *) 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. + trunk patch: http://svn.apache.org/r1811664 + http://svn.apache.org/r1814118 + 2.4.x patch: trunk works (modulo CHANGES) + svn merge -c 1811664,1814118 ^/httpd/httpd/trunk . + +1: ylavic, jim, icing + PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -233,15 +242,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: svn merge -c 1813643 ^/httpd/httpd/trunk . +1: ylavic, icing - *) 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. - trunk patch: http://svn.apache.org/r1811664 - http://svn.apache.org/r1814118 - 2.4.x patch: trunk works (modulo CHANGES) - svn merge -c 1811664,1814118 ^/httpd/httpd/trunk . - +1: ylavic, jim - PATCHES/ISSUES THAT ARE BEING WORKED [ New entries should be added at the START of the list ] -- 2.50.1