diff options
| author | Stefan Eissing <icing@apache.org> | 2017-11-07 09:01:59 +0000 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2017-11-07 09:01:59 +0000 |
| commit | 2b9b086839efb49e49c955e091de61f36aee5f3b (patch) | |
| tree | 18cca9fe7071be848a14a1618a4ab3b5539c9404 /STATUS | |
| parent | a6c1cc8881da92db27d22f9d3b3846798fb1a49f (diff) | |
| download | httpd-2b9b086839efb49e49c955e091de61f36aee5f3b.tar.gz | |
On the 2.4.x branch:
Merged /httpd/httpd/trunk:r1811649,1811664,1814118
*) 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. [Yann Ylavic]
*) ab: Keep reading nonblocking to exhaust TCP or SSL buffers when previous
read was incomplete (the SSL case can cause the next poll() to timeout
since data are buffered already). PR 61301 [Luca Toscano, Yann Ylavic]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1814468 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'STATUS')
| -rw-r--r-- | STATUS | 16 |
1 files changed, 0 insertions, 16 deletions
@@ -118,13 +118,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) ab: Keep reading nonblocking to exhaust TCP or SSL buffers when previous - read was incomplete. PR 61301 - trunk patch: https://svn.apache.org/r1811649 - 2.4.x patch: trunk works modulo CHANGES - svn merge -c 1811649 ^/httpd/httpd/trunk . - +1: elukey, icing, ylavic - *) core, mod_rewrite: introduce the 'keeps-redirect-vary' note in the internal redirect workflow to keep the Vary headers set by RewriteCond/Rule directives combinations in the directory context. PR: 58231 @@ -132,15 +125,6 @@ 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 ] |