change readbytes from a apr_size_t to a apr_off_t to match the parameter

required in ap_get_brigade
Submitted by:	 barbee@veribox.net
Reviewed by:	 ianh@apache.org

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90012 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/proxy/CHANGES b/modules/proxy/CHANGES
index dd095130855f8504e757321e3bb2badc4cbb65af..7a8fe9bfc7c77c45df2331c2755b85ccdad4a267 100644 (file)
--- a/modules/proxy/CHANGES
+++ b/modules/proxy/CHANGES
@@ -1,3 +1,6 @@
+mod_proxy changes for httpd 2.0.23-dev
+  *) Change 'readbytes' from apr_size_t to apr_off_t due to change
+     in ap_get_brigade's parameters [Barbee barbee@veribox.nbet]
 
 mod_proxy changes for httpd 2.0.20-dev
   *) Timeout added for backend connections.

diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index ec39ce1a4adda470702ed69213dacf1253ab3894..44226e2edb69ded67dfe5033e31ecb7c6a13322b 100644 (file)
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -555,7 +555,7 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
     int i = 0, j, len, rc;
     int one = 1;
     char *size = NULL;
-    apr_size_t readbytes = -1;
+    apr_off_t readbytes = -1;
 
     /* stuff for PASV mode */
     int connect = 0, use_port = 0;

diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index 184c8c7844d116743d3e7986e97f68c192ef62d7..d86322205e5a77a377c210fecd7105af3f99e964 100644 (file)
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -752,7 +752,7 @@ int ap_proxy_http_handler(request_rec *r, proxy_server_conf *conf,
         (r->status != HTTP_NOT_MODIFIED)) {    /* not 304 */
 
        const char *buf;
-       apr_size_t readbytes;
+       apr_off_t readbytes;
 
        /* if chunked - insert DECHUNK filter */
        if (ap_proxy_liststr((buf = apr_table_get(r->headers_out, "Transfer-Encoding")), "chunked")) {