From: Stefan Eissing <icing@apache.org>
Date: Tue, 7 Nov 2017 09:02:41 +0000 (+0000)
Subject: On the trunk:
X-Git-Tag: 2.5.0-alpha~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c0886128278c49e9c103670680848dc76a19bd1;p=apache

On the trunk:

update CHANGES after backport



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1814469 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 0598a2b2dd..dad48d014f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -22,14 +22,6 @@ Changes with Apache 2.5.0
      and the related RewriteRule is used in a Directory context
      (triggering an internal redirect). [Luca Toscano]
 
-  *) 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]
-
   *) mod_md: v0.9.9, fix for applying challenge type based on available ports. [Stefan Eissing]
 
   *) mod_proxy_uwsgi: New UWSGI mod_proxy (sub)module contributed by unbit.com.