httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject cvs commit: httpd-proxy/module-2.0 proxy_ftp.c proxy_http.c proxy_util.c
Date Tue, 24 Apr 2001 04:38:54 GMT
minfrin     01/04/23 21:38:54

  Modified:    module-2.0 proxy_ftp.c proxy_http.c proxy_util.c
  Log:
  Made the variable naming the same as everywhere else in Apache for the
  ap_get_brigade() fix.
  
  Revision  Changes    Path
  1.52      +2 -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.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- proxy_ftp.c	2001/04/23 21:49:11	1.51
  +++ proxy_ftp.c	2001/04/24 04:38:51	1.52
  @@ -550,7 +550,7 @@
       int i, j, len, rc;
       int one = 1;
       char *size = NULL;
  -    apr_size_t remain = -1;
  +    apr_size_t readbytes = -1;
   
       /* stuff for PASV mode */
       int connect = 0, use_port = 0;
  @@ -1574,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, &remain) ==
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.65      +5 -5      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.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- proxy_http.c	2001/04/23 21:49:15	1.64
  +++ proxy_http.c	2001/04/24 04:38:52	1.65
  @@ -744,7 +744,7 @@
       /* send body */
       if (!r->header_only) {
   	const char *buf;
  -	apr_size_t remain;
  +	apr_size_t readbytes;
   
   	/* if chunked - insert DECHUNK filter */
   	if (ap_proxy_liststr((buf = apr_table_get(r->headers_out, "Transfer-Encoding")), "chunked"))
{
  @@ -754,12 +754,12 @@
   		apr_table_set(r->headers_out, "Transfer-Encoding", buf);
   	    }
   	    ap_add_input_filter("DECHUNK", NULL, rp, origin);
  -	    remain = -1;
  +	    readbytes = -1;
   	}
   
   	/* if content length - set the length to read */
   	else if ((buf = apr_table_get(r->headers_out, "Content-Length"))) {
  -	    remain = atol(buf);
  +	    readbytes = atol(buf);
   	}
   
   	/* no chunked / no length therefore read till EOF and cancel keepalive */
  @@ -769,14 +769,14 @@
   
   	/* if keepalive cancelled, read to EOF */
   	if (close) {
  -	    remain = -1;
  +	    readbytes = -1;
   	}
   
   	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
   		     "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, &readbytes) == APR_SUCCESS)
{
   	    if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) {
   		e = apr_bucket_flush_create();
   		APR_BRIGADE_INSERT_TAIL(bb, e);
  
  
  
  1.57      +3 -3      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.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- proxy_util.c	2001/04/24 02:50:19	1.56
  +++ proxy_util.c	2001/04/24 04:38:53	1.57
  @@ -1087,11 +1087,11 @@
   {
       apr_bucket *e;
       apr_status_t rv;
  -    apr_size_t zero = 0;
  +    apr_size_t readbytes = 0;	/* line-at-a-time */
       char *pos = buff;
       char *response;
       int found = 0;
  -    size_t len;
  +    apr_size_t len;
   
       /* start with an empty string */
       buff[0] = 0;
  @@ -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, &zero)))
{
  +	if (APR_SUCCESS != (rv = ap_get_brigade(c->input_filters, bb, AP_MODE_BLOCKING, &readbytes)))
{
   	    return rv;
   	}
   
  
  
  

Mime
View raw message