diff options
| author | Ryan Bloom <rbb@apache.org> | 2001-05-06 23:27:14 +0000 |
|---|---|---|
| committer | Ryan Bloom <rbb@apache.org> | 2001-05-06 23:27:14 +0000 |
| commit | 1c98aabbf13be673d386684d13e066139eed3c68 (patch) | |
| tree | af55065613e5e674267768b224210e378323225d /modules/tls | |
| parent | a8c521cf1e9897c6041988d001f31ca7d6b77a7d (diff) | |
| download | httpd-1c98aabbf13be673d386684d13e066139eed3c68.tar.gz | |
Back out the recent change to ap_get_brigade, to make it use indirection
again. The problem is that the amount of data read from the network,
is not necessarily the amount of data returned from the filters. It is
possible for input filters to add bytes to the data read from the network.
To fix the original bug, I just removed the line from ap_get_client_block
that decremented r->remaining, we allow the http_filter to do that for
us.
I have also removed an incorrect comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89041 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/tls')
| -rw-r--r-- | modules/tls/mod_tls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/tls/mod_tls.c b/modules/tls/mod_tls.c index 3f3130694b..de7f8ece2c 100644 --- a/modules/tls/mod_tls.c +++ b/modules/tls/mod_tls.c @@ -186,7 +186,7 @@ static apr_status_t churn_output(TLSFilterCtx *pCtx) return APR_SUCCESS; } -static apr_status_t churn(TLSFilterCtx *pCtx,apr_read_type_e eReadType,apr_size_t readbytes) +static apr_status_t churn(TLSFilterCtx *pCtx,apr_read_type_e eReadType,apr_size_t *readbytes) { ap_input_mode_t eMode=eReadType == APR_BLOCK_READ ? AP_MODE_BLOCKING : AP_MODE_NONBLOCKING; @@ -333,7 +333,7 @@ static apr_status_t tls_out_filter(ap_filter_t *f,apr_bucket_brigade *pbbIn) } static apr_status_t tls_in_filter(ap_filter_t *f,apr_bucket_brigade *pbbOut, - ap_input_mode_t eMode, apr_size_t readbytes) + ap_input_mode_t eMode, apr_size_t *readbytes) { TLSFilterCtx *pCtx=f->ctx; apr_read_type_e eReadType=eMode == AP_MODE_BLOCKING ? APR_BLOCK_READ : |