You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by or...@apache.org on 2001/08/03 18:25:10 UTC

cvs commit: httpd-proxy/module-2.0 proxy_ftp.c proxy_http.c

orlikowski    01/08/03 09:25:10

  Modified:    module-2.0 proxy_ftp.c proxy_http.c
  Log:
  Both the ftp and http proxies were erroneously sending a flush bucket after
  an eos bucket. This had been put in place to repair a bug, but was covering
  the symptoms, rather than providing the cure. Bug repaired, and kludge
  removed.
  
  Submitted by: barbee@veribox.net
  
  Revision  Changes    Path
  1.76      +0 -2      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.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- proxy_ftp.c	2001/07/18 20:35:13	1.75
  +++ proxy_ftp.c	2001/08/03 16:25:10	1.76
  @@ -1583,8 +1583,6 @@
   	/* read the body, pass it to the output filters */
   	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);
   		ap_pass_brigade(r->output_filters, bb);
   		break;
   	    }
  
  
  
  1.83      +0 -2      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.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- proxy_http.c	2001/07/31 19:12:56	1.82
  +++ proxy_http.c	2001/08/03 16:25:10	1.83
  @@ -783,8 +783,6 @@
   	/* read the body, pass it to the output filters */
   	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);
   		ap_pass_brigade(r->output_filters, bb);
   		break;
   	    }