From: Chuck Murcko Date: Sun, 6 May 2001 10:59:22 +0000 (+0000) Subject: Track Greg's change to byte count for input filters X-Git-Tag: 2.0.18~76 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea5093e17f66c751a7b0287cbe9a235f3fd19b5d;p=apache Track Greg's change to byte count for input filters git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89037 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c index a6661db7a9..26dc12c3ac 100644 --- a/modules/proxy/proxy_ftp.c +++ b/modules/proxy/proxy_ftp.c @@ -1579,7 +1579,7 @@ PROXY_DECLARE (int) ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf "proxy: FTP: start body send"); /* read the body, pass it to the output filters */ - while (ap_get_brigade(remote->input_filters, bb, AP_MODE_BLOCKING, &readbytes) == APR_SUCCESS) { + while (ap_get_brigade(remote->input_filters, bb, AP_MODE_BLOCKING, readbytes) == APR_SUCCESS) { if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) { e = apr_bucket_flush_create(); APR_BRIGADE_INSERT_TAIL(bb, e); diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c index f6d3213a28..cf1f3c5148 100644 --- a/modules/proxy/proxy_http.c +++ b/modules/proxy/proxy_http.c @@ -781,7 +781,7 @@ PROXY_DECLARE (int) ap_proxy_http_handler(request_rec *r, proxy_server_conf *con "proxy: start body send"); /* read the body, pass it to the output filters */ - while (ap_get_brigade(rp->input_filters, bb, AP_MODE_BLOCKING, &readbytes) == APR_SUCCESS) { + while (ap_get_brigade(rp->input_filters, bb, AP_MODE_BLOCKING, readbytes) == APR_SUCCESS) { if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) { e = apr_bucket_flush_create(); APR_BRIGADE_INSERT_TAIL(bb, e); diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index b51feb1a11..a70f5c38ab 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -1101,7 +1101,7 @@ apr_status_t ap_proxy_string_read(conn_rec *c, apr_bucket_brigade *bb, while (!found) { /* get brigade from network one line at a time */ - if (APR_SUCCESS != (rv = ap_get_brigade(c->input_filters, bb, AP_MODE_BLOCKING, &readbytes))) { + if (APR_SUCCESS != (rv = ap_get_brigade(c->input_filters, bb, AP_MODE_BLOCKING, readbytes))) { return rv; }