From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 29 Sep 2015 10:31:58 +0000 (+0000)
Subject: mod_ssl: follow up to r1705194, r1705823, r1705826 and r1705828.
X-Git-Tag: 2.5.0-alpha~2788
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cb5958ce847d7c6d2d74f3696d42ec7a358b0f9;p=thirdparty%2Fapache%2Fhttpd.git

mod_ssl: follow up to r1705194, r1705823, r1705826 and r1705828.
Add CHANGES entry, and restore ap_process_request_after_handler()'s comment
as prior to r1705194 (the change makes no sense now).


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

diff --git a/CHANGES b/CHANGES
index 522eda0317d..c37d6f98bc2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_ssl: Make the output filter more friendly with deferred write and
+     response pipelining. [Yann Ylavic, Joe Orton]
+
   *) core/util_script: relax alphanumeric filter of environment variable names
      on Windows to allow '(' and ')' for passing PROGRAMFILES(X86) et.al.
      unadulterated in 64 bit versions of Windows. PR 46751.  
diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index cbf88404684..0143a2e73fb 100644
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -256,8 +256,8 @@ AP_DECLARE(void) ap_process_request_after_handler(request_rec *r)
     apr_bucket *b;
     conn_rec *c = r->connection;
 
-    /* Send an EOR bucket (alone!) through the output filter chain.
-     * When this bucket is destroyed, the request will be logged and
+    /* Send an EOR bucket through the output filter chain.  When
+     * this bucket is destroyed, the request will be logged and
      * its pool will be freed
      */
     bb = apr_brigade_create(c->pool, c->bucket_alloc);