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 a6661db7a986a422c83f065a113a4b0d556bb3af..26dc12c3ac00eb527034f679fabd3565aa05a708 100644 (file)
--- 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 f6d3213a288eeacf208b8ce5a063ff5bd7e1110a..cf1f3c5148d410994631e9afe1e91caa6e25e2a2 100644 (file)
--- 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 b51feb1a1169442d783b98910f76b89b4e256a85..a70f5c38abfc955797de4a1181c3808557d553f7 100644 (file)
--- 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;
        }