Commit a95a99e9 authored by Victor J. Orlikowski's avatar Victor J. Orlikowski
Browse files

Sometimes, boys and girls, pointers and integers *aren't interchangeable. 


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

modules/proxy/proxy_ftp.c

+2 −1
Original line number Diff line number Diff line
@@ -550,6 +550,7 @@ PROXY_DECLARE (int) ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf 
    int i, j, len, rc;

    int one = 1;

    char *size = NULL;

    apr_size_t remain = -1;



    /* stuff for PASV mode */

    int connect = 0, use_port = 0;
@@ -1573,7 +1574,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, -1) == APR_SUCCESS) {

	while (ap_get_brigade(remote->input_filters, bb, AP_MODE_BLOCKING, &remain) == APR_SUCCESS) {

	    if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) {

		e = apr_bucket_flush_create();

		APR_BRIGADE_INSERT_TAIL(bb, e);

modules/proxy/proxy_http.c

+1 −1
Original line number Diff line number Diff line
@@ -776,7 +776,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, remain) == APR_SUCCESS) {

	while (ap_get_brigade(rp->input_filters, bb, AP_MODE_BLOCKING, &remain) == APR_SUCCESS) {

	    if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) {

		e = apr_bucket_flush_create();

		APR_BRIGADE_INSERT_TAIL(bb, e);