diff options
| author | Brian Pane <brianp@apache.org> | 2001-11-26 08:21:48 +0100 |
|---|---|---|
| committer | Brian Pane <brianp@apache.org> | 2001-11-26 08:21:48 +0100 |
| commit | df871d8895b56a7260355244be381f0084a0eaa6 (patch) | |
| tree | 07f660c8409d8332ae7e393f0cd7b3216ebf47b5 /server | |
| parent | Add a link to the new mailing list. (diff) | |
| download | apache2-df871d8895b56a7260355244be381f0084a0eaa6.tar.xz apache2-df871d8895b56a7260355244be381f0084a0eaa6.zip | |
More fixes for core_input_filter()'s concatenation of small buckets:
update last_e and nbytes after compacting the brigade
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92174 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
| -rw-r--r-- | server/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/server/core.c b/server/core.c index aeeaf92cbd..caf2d84ac9 100644 --- a/server/core.c +++ b/server/core.c @@ -3088,6 +3088,7 @@ static apr_status_t core_output_filter(ap_filter_t *f, apr_bucket_brigade *b) while (temp != e) { apr_bucket *d; rv = apr_bucket_read(temp, &str, &n, APR_BLOCK_READ); + nbytes -= n; apr_brigade_write(temp_brig, NULL, NULL, str, n); d = temp; temp = APR_BUCKET_NEXT(temp); @@ -3098,6 +3099,7 @@ static apr_status_t core_output_filter(ap_filter_t *f, apr_bucket_brigade *b) APR_BRIGADE_INSERT_HEAD(b, temp); apr_brigade_destroy(temp_brig); e = temp; + last_e = e; nvec = 0; apr_bucket_read(e, &str, &n, APR_BLOCK_READ); } |