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

There's only one way for bb to be non-NULL, so these two

Browse Source 
cases can be combined.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90513 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Cliff Woolley
2001-08-22 22:25:14 +00:00
parent 3ae56fb280
commit 6178a2c69e
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/ssl/ssl_engine_io.c
View File

@@ -150,7 +150,6 @@ static apr_status_t churn_output(SSLFilterRec *ctx)
{
ap_filter_t *f = ctx->pOutputFilter;
apr_pool_t *p = f->c->pool;
apr_bucket_brigade *bb = NULL;
if (!ctx->pssl) {
/* we've been shutdown */
@@ -159,10 +158,9 @@ static apr_status_t churn_output(SSLFilterRec *ctx)
if (BIO_pending(ctx->pbioWrite)) {
BUF_MEM *bm = BIO_mem(ctx->pbioWrite);
apr_bucket_brigade *bb = apr_brigade_create(p);
apr_bucket *bucket;
bb = apr_brigade_create(p);
/*
* use the BIO memory buffer that has already been allocated,
* rather than making another copy of it.
@@ -176,15 +174,13 @@ static apr_status_t churn_output(SSLFilterRec *ctx)
bm->length = 0; /* reset */
APR_BRIGADE_INSERT_TAIL(bb, bucket);
}
/* XXX: check for errors */
if (bb) {
apr_bucket *bucket = apr_bucket_flush_create();
/* XXX: it may be possible to not always flush */
APR_BRIGADE_INSERT_TAIL(bb, bucket);
ap_pass_brigade(f->next, bb);
bucket = apr_bucket_flush_create();
APR_BRIGADE_INSERT_TAIL(bb, bucket);
/* XXX: check for errors */
ap_pass_brigade(f->next, bb);
}
return APR_SUCCESS;