svn commit: r307341 - in /httpd/httpd/branches/2.0.x: STATUS modules/ssl/ssl_engine_io.c

[wr...@apache.org]

Author: wrowe
Date: Sat Oct  8 19:20:58 2005
New Revision: 307341

URL: http://svn.apache.org/viewcvs?rev=307341&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.0.x/STATUS
    httpd/httpd/branches/2.0.x/modules/ssl/ssl_engine_io.c

Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/STATUS?rev=307341&r1=307340&r2=307341&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Sat Oct  8 19:20:58 2005
@@ -99,11 +99,13 @@
 
     * 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. ]
 
@@ -222,11 +224,6 @@
         2.0.x Patch: http://issues.apache.org/bugzilla/attachment.cgi?id=15297
         +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

Modified: httpd/httpd/branches/2.0.x/modules/ssl/ssl_engine_io.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/ssl/ssl_engine_io.c?rev=307341&r1=307340&r2=307341&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/ssl/ssl_engine_io.c (original)
+++ httpd/httpd/branches/2.0.x/modules/ssl/ssl_engine_io.c Sat Oct  8 19:20:58 2005
@@ -1403,6 +1403,7 @@
 
     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);