httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "William A. Rowe, Jr." <wr...@rowe-clan.net>
Subject Re: svn commit: r478141 - /httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
Date Wed, 22 Nov 2006 12:41:07 GMT
Offhand, doesn't ctx pool span the connection?

I think you just started setting aside what is part of the next request
into the current req_rec's pool.



jorton@apache.org wrote:
> Author: jorton
> Date: Wed Nov 22 04:11:57 2006
> New Revision: 478141
> 
> URL: http://svn.apache.org/viewvc?view=rev&rev=478141
> Log:
> * modules/ssl/ssl_engine_io.c (ssl_io_buffer_fill): Remove subpool; it
> cannot be destroyed before r->pool so serves no purpose.
> 
> Modified:
>     httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
> 
> Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_io.c?view=diff&rev=478141&r1=478140&r2=478141
> ==============================================================================
> --- httpd/httpd/trunk/modules/ssl/ssl_engine_io.c (original)
> +++ httpd/httpd/trunk/modules/ssl/ssl_engine_io.c Wed Nov 22 04:11:57 2006
> @@ -1454,7 +1454,6 @@
>  
>  struct modssl_buffer_ctx {
>      apr_bucket_brigade *bb;
> -    apr_pool_t *pool;
>  };
>  
>  int ssl_io_buffer_fill(request_rec *r)
> @@ -1469,8 +1468,7 @@
>       * containing a setaside pool and a brigade which constrain the
>       * lifetime of the buffered data. */
>      ctx = apr_palloc(r->pool, sizeof *ctx);
> -    apr_pool_create(&ctx->pool, r->pool);
> -    ctx->bb = apr_brigade_create(ctx->pool, c->bucket_alloc);
> +    ctx->bb = apr_brigade_create(r->pool, c->bucket_alloc);
>  
>      /* ... and a temporary brigade. */
>      tempb = apr_brigade_create(r->pool, c->bucket_alloc);
> @@ -1515,7 +1513,7 @@
>                  total += len;
>              }
>  
> -            rv = apr_bucket_setaside(e, ctx->pool);
> +            rv = apr_bucket_setaside(e, r->pool);
>              if (rv != APR_SUCCESS) {
>                  ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
>                                "could not setaside bucket for SSL buffer");
> 
> 
> 
> .
> 


Mime
View raw message