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 CHANGES proxy_util.c
Date Thu, 28 Jun 2001 12:49:04 GMT
chuck       01/06/28 05:49:02

  Modified:    module-2.0 CHANGES proxy_util.c
  Log:
  Reorganize ap_proxy_string_read() internally to not process eos buckets.
  
  Revision  Changes    Path
  1.3       +12 -3     httpd-proxy/module-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-2.0/CHANGES,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CHANGES	2001/06/28 10:00:06	1.2
  +++ CHANGES	2001/06/28 12:48:54	1.3
  @@ -1,9 +1,15 @@
   
   mod_proxy changes for httpd 2.0.18-dev
   
  +  *) Reorganize ap_proxy_string_read() internally to not process eos
  +     buckets.
  +     [Chuck Murcko <chuck@topsail.org>]
  +     [Victor Orlikowski <v.j.orlikowski@gte.net>]
  +
     *) Remove result code check for FTP QUIT command. Some servers send
        nothing at all back in response to QUIT.
        [Chuck Murcko <chuck@topsail.org>]
  +     [Victor Orlikowski <v.j.orlikowski@gte.net>]
   
     *) Reverse previous patch since the core reverted.
        [Chuck Murcko <chuck@topsail.org>]
  @@ -130,9 +136,12 @@
   mod_proxy changes for 2.0.14 alpha
   
     *) removed ProxyNoCache and ProxyCacheForceCompletion config directives,
  -     since we no longer directly cache from this module [Chuck Murcko]
  +     since we no longer directly cache from this module
  +     [Chuck Murcko <chuck@topsail.org>]
   
  -  *) removed cache [Chuck Murcko]
  +  *) removed cache
  +     [Chuck Murcko <chuck@topsail.org>]
   
  -  *) initial rerebuild for 2.0 [Chuck Murcko]
  +  *) initial rerebuild for 2.0
  +     [Chuck Murcko <chuck@topsail.org>]
   
  
  
  
  1.63      +15 -14    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.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- proxy_util.c	2001/06/28 07:05:18	1.62
  +++ proxy_util.c	2001/06/28 12:48:57	1.63
  @@ -1110,21 +1110,22 @@
   	    e = APR_BRIGADE_FIRST(bb);
   	    if (APR_BUCKET_IS_EOS(e)) {
   		*eos = 1;
  -		continue;
  -	    }
  -	    if (APR_SUCCESS != apr_bucket_read(e, (const char **)&response, &len, APR_BLOCK_READ))
{
  -		return rv;
  -	    }
  +            }
  +            else {
  +                if (APR_SUCCESS != apr_bucket_read(e, (const char **)&response, &len,
APR_BLOCK_READ)) {
  +                    return rv;
  +                }
   	    /* is string LF terminated? */
  -	    if (memchr(response, APR_ASCII_LF, len)) {
  -		found = 1;
  -	    }
  -	    /* concat strings until buff is full - then throw the data away */
  -	    if (len > ((bufflen-1)-(pos-buff))) {
  -		len = (bufflen-1)-(pos-buff);
  -	    }
  -	    if (len > 0) {
  -		pos = apr_cpystrn(pos, response, len);
  +                if (memchr(response, APR_ASCII_LF, len)) {
  +                    found = 1;
  +                }
  +            /* concat strings until buff is full - then throw the data away */
  +                if (len > ((bufflen-1)-(pos-buff))) {
  +                    len = (bufflen-1)-(pos-buff);
  +                }
  +                if (len > 0) {
  +                    pos = apr_cpystrn(pos, response, len);
  +                }
   	    }
   	    APR_BUCKET_REMOVE(e);
   	    apr_bucket_destroy(e);
  
  
  

Mime
View raw message