modules/ssl/ssl_engine_io.c (ssl_io_filter_init): Initialize the

nobuffer flag to zero since the structure is palloc'ed not pcalloc'ed.

PR: 35279
Backport: 189971
Author: jorton
Reviewed by: jerenkrantz, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@307341 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 9846ac5a3ba796303d310da313602621461fcba4..b68913d757073719aebf398592917c06caf44d83 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -99,11 +99,13 @@ CURRENT RELEASE NOTES:
 
     * All commits to branches/2.0.x must be reflected in SVN trunk,
       as well, if they apply.  Logical progression is commit to trunk,
-      get feedback and votes in STATUS, and then merge into branches/2.0.x.
+      get feedback and votes on list or in STATUS, then merge into 
+      branches/2.2.x, and finally merge into branches/2.0.x, as applicable.
 
 
 RELEASE SHOWSTOPPERS:
 
+
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
@@ -223,11 +225,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         +1: pquerna, jerenkrantz, colm
         jerenkrantz notes: I do prefer the version from r190033 (own if check).
 
-     *) mod_ssl: Fix buffering in SSL output filter.
-        http://svn.apache.org/viewcvs?rev=189971&view=rev
-        PR: 35279
-        +1: jorton, jerenkrantz
-
      *) Reverse Proxy fixes: <Location> bug and Cookie support
         Patch is at
         http://marc.theaimsgroup.com/?l=apache-httpd-dev&m=112365629308138&q=p4

diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c
index 91b32d66bf6ffc19139d33961a3e33d4d6c989c5..54b18900dee53be11ff8da2ea0f42eeb4140aae2 100644 (file)
--- a/modules/ssl/ssl_engine_io.c
+++ b/modules/ssl/ssl_engine_io.c
@@ -1403,6 +1403,7 @@ void ssl_io_filter_init(conn_rec *c, SSL *ssl)
 
     filter_ctx = apr_palloc(c->pool, sizeof(ssl_filter_ctx_t));
 
+    filter_ctx->nobuffer        = 0;
     filter_ctx->pOutputFilter   = ap_add_output_filter(ssl_io_filter,
                                                    filter_ctx, NULL, c);