httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ch...@apache.org
Subject cvs commit: httpd-proxy/module-2.0 proxy_ftp.c proxy_http.c proxy_util.c
Date Mon, 07 May 2001 02:47:52 GMT
chuck       01/05/06 19:47:52

  Modified:    .        CHANGES
               module-2.0 proxy_ftp.c proxy_http.c proxy_util.c
  Log:
  Crikey.
  
  Revision  Changes    Path
  1.33      +3 -0      httpd-proxy/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/CHANGES,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- CHANGES	2001/05/06 10:59:22	1.32
  +++ CHANGES	2001/05/07 02:47:51	1.33
  @@ -1,6 +1,9 @@
   
   mod_proxy changes for httpd 2.0.18-dev
   
  +  *) Reverse previous patch since the core reverted.
  +     [Chuck Murcko <chuck@topsail.org>]
  +
     *) Remove indirection on number of bytes to read for input filters.
        [Chuck Murcko <chuck@topsail.org>]
   
  
  
  
  1.55      +1 -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.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- proxy_ftp.c	2001/05/06 10:59:22	1.54
  +++ proxy_ftp.c	2001/05/07 02:47:51	1.55
  @@ -1579,7 +1579,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, readbytes) == APR_SUCCESS)
{
  +	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);
  
  
  
  1.68      +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.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- proxy_http.c	2001/05/06 10:59:22	1.67
  +++ proxy_http.c	2001/05/07 02:47:51	1.68
  @@ -781,7 +781,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, readbytes) == APR_SUCCESS)
{
  +	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);
  
  
  
  1.59      +1 -1      httpd-proxy/module-2.0/proxy_util.c
  
  Index: proxy_util.c
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-2.0/proxy_util.c,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- proxy_util.c	2001/05/06 10:59:22	1.58
  +++ proxy_util.c	2001/05/07 02:47:51	1.59
  @@ -1101,7 +1101,7 @@
       while (!found) {
   
   	/* get brigade from network one line at a time */
  -	if (APR_SUCCESS != (rv = ap_get_brigade(c->input_filters, bb, AP_MODE_BLOCKING, readbytes)))
{
  +	if (APR_SUCCESS != (rv = ap_get_brigade(c->input_filters, bb, AP_MODE_BLOCKING, &readbytes)))
{
   	    return rv;
   	}
   
  
  
  

Mime
View raw message