httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From orlikow...@apache.org
Subject cvs commit: httpd-proxy/module-2.0 proxy_ftp.c proxy_http.c
Date Mon, 23 Apr 2001 21:49:21 GMT
orlikowski    01/04/23 14:49:21

  Modified:    module-2.0 proxy_ftp.c proxy_http.c
  Log:
  Sometimes, boys and girls, pointers and integers *aren't interchangeable.
  
  Revision  Changes    Path
  1.51      +2 -1      httpd-proxy/module-2.0/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-2.0/proxy_ftp.c,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- proxy_ftp.c	2001/04/23 21:03:34	1.50
  +++ proxy_ftp.c	2001/04/23 21:49:11	1.51
  @@ -550,6 +550,7 @@
       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: 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);
  
  
  
  1.64      +1 -1      httpd-proxy/module-2.0/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-2.0/proxy_http.c,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- proxy_http.c	2001/04/23 21:03:37	1.63
  +++ proxy_http.c	2001/04/23 21:49:15	1.64
  @@ -776,7 +776,7 @@
   		     "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);
  
  
  

Mime
View raw message