Commit 6f7820dd authored by Ian Holsman's avatar Ian Holsman
Browse files

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
parent a497369a

modules/proxy/CHANGES

+3 −0
Original line number Diff line number Diff line 
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.

modules/proxy/proxy_ftp.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

modules/proxy/proxy_http.c

+1 −1
Original line number Diff line number Diff line
@@ -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")) {