1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00

* modules/ssl/ssl_engine_io.c (ssl_io_buffer_fill): Remove subpool; it

cannot be destroyed before r->pool so serves no purpose.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@478141 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2006-11-22 12:11:57 +00:00
parent a812d1a0cc
commit bc522e757b

View File

@@ -1454,7 +1454,6 @@ static apr_status_t ssl_io_filter_output(ap_filter_t *f,
struct modssl_buffer_ctx {
apr_bucket_brigade *bb;
apr_pool_t *pool;
};
int ssl_io_buffer_fill(request_rec *r)
@@ -1469,8 +1468,7 @@ int ssl_io_buffer_fill(request_rec *r)
* 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 @@ int ssl_io_buffer_fill(request_rec *r)
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");