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

destroy the brigade when we are done with it, rather than remove

Browse Source 
one bucket at a time.  prevents a problem when downloading large files.
also change ssl_io_filter_Output to apache style
and change some variable names that should make the code easier to
read/understand, e.g. pbbIn -> bb, pbktIn -> bucket
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90490 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doug MacEachern
2001-08-22 15:30:37 +00:00
parent e8236dd60c
commit 8354775eec
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
modules/ssl/ssl_engine_io.c
View File

@@ -326,41 +326,38 @@ static apr_status_t churn (SSLFilterRec *pRec,
return churn_output(pRec);
}
static apr_status_t ssl_io_filter_Output(ap_filter_t *f,apr_bucket_brigade *pbbIn)
static apr_status_t ssl_io_filter_Output(ap_filter_t *f,
apr_bucket_brigade *bb)
{
SSLFilterRec *pRec=f->ctx;
apr_bucket *pbktIn;
SSLFilterRec *ctx = f->ctx;
apr_bucket *bucket;
apr_status_t ret = APR_SUCCESS;
APR_BRIGADE_FOREACH(pbktIn,pbbIn) {
APR_BRIGADE_FOREACH(bucket, bb) {
const char *data;
apr_size_t len, n;
apr_status_t ret;
APR_BUCKET_REMOVE(pbktIn);
if(APR_BUCKET_IS_EOS(pbktIn)) {
if ((ret = churn_output(pRec)) != APR_SUCCESS)
{
ap_log_error(
APLOG_MARK,APLOG_ERR,ret,NULL, "Error in churn_output");
return ret;
if (APR_BUCKET_IS_EOS(bucket)) {
if ((ret = churn_output(ctx)) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, ret, NULL,
"Error in churn_output");
}
break;
}
if (!APR_BUCKET_IS_FLUSH(pbktIn)) {
if (!APR_BUCKET_IS_FLUSH(bucket)) {
/* read filter */
apr_bucket_read(pbktIn,&data,&len,APR_BLOCK_READ);
apr_bucket_read(bucket, &data, &len, APR_BLOCK_READ);
/* write SSL */
n = ssl_io_hook_write(pRec->pssl, (unsigned char *)data, len);
n = ssl_io_hook_write(ctx->pssl, (unsigned char *)data, len);
if (n != len) {
conn_rec *c = (conn_rec *)SSL_get_app_data(pRec->pssl);
conn_rec *c = f->c;
char *reason = "reason unknown";
/* XXX: probably a better way to determine this */
if (SSL_total_renegotiations(pRec->pssl)) {
if (SSL_total_renegotiations(ctx->pssl)) {
reason = "likely due to failed renegotiation";
}
@@ -368,7 +365,8 @@ static apr_status_t ssl_io_filter_Output(ap_filter_t *f,apr_bucket_brigade *pbbI
"failed to write %d of %d bytes (%s)",
n > 0 ? len - n : len, len, reason);
return APR_EINVAL;
ret = APR_EINVAL;
break;
}
}
/* else fallthrough to flush the current wbio
@@ -376,11 +374,13 @@ static apr_status_t ssl_io_filter_Output(ap_filter_t *f,apr_bucket_brigade *pbbI
*/
/* churn the state machine */
ret=churn_output(pRec);
if(ret != APR_SUCCESS)
return ret;
if ((ret = churn_output(ctx)) != APR_SUCCESS) {
break;
}
return APR_SUCCESS;
}
apr_brigade_destroy(bb);
return ret;
}
static apr_status_t ssl_io_filter_Input(ap_filter_t *f,apr_bucket_brigade *pbbOut,