httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ch...@apache.org
Subject cvs commit: apache-1.3/src/modules/proxy mod_proxy.c proxy_util.c
Date Mon, 24 Sep 2001 20:14:27 GMT
chuck       01/09/24 13:14:27

  Modified:    src/modules/proxy mod_proxy.c proxy_util.c
  Log:
  Fixes problems with origin server connection close if client dies
  Fixes CacheForceCompletion directive
  PR: 7383, 8067, 8090
  Obtained from: 	Alexey Panchenko <panchenko@liwest.ru>
  Submitted by:	Alexey Panchenko <panchenko@liwest.ru>
  Reviewed by:	Chuck Murcko
  
  Revision  Changes    Path
  1.75      +1 -1      apache-1.3/src/modules/proxy/mod_proxy.c
  
  Index: mod_proxy.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/proxy/mod_proxy.c,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- mod_proxy.c	2001/01/15 17:05:27	1.74
  +++ mod_proxy.c	2001/09/24 20:14:27	1.75
  @@ -856,7 +856,7 @@
       if (s > 0)
         psf->cache.cache_completion = ((float)s / 100);
   
  -    psf->cache.cache_completion = 1;
  +    psf->cache.cache_completion_set = 1;
       return NULL;    
   }
   
  
  
  
  1.100     +3 -1      apache-1.3/src/modules/proxy/proxy_util.c
  
  Index: proxy_util.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_util.c,v
  retrieving revision 1.99
  retrieving revision 1.100
  diff -u -r1.99 -r1.100
  --- proxy_util.c	2001/09/21 09:04:19	1.99
  +++ proxy_util.c	2001/09/24 20:14:27	1.100
  @@ -588,7 +588,7 @@
                   ap_reset_timeout(r);
   
               if (w <= 0) {
  -                if (c != NULL && c->fp != NULL) {
  +                if (c != NULL) {
                       /* when a send failure occurs, we need to decide
                        * whether to continue loading and caching the
                        * document, or to abort the whole thing
  @@ -598,8 +598,10 @@
                            (c->len * c->cache_completion < total_bytes_rcvd);
   
                       if (! ok) {
  +                        if (c->fp!=NULL) {
                           ap_pclosef(c->req->pool, ap_bfileno(c->fp, B_WR));
                           c->fp = NULL;
  +                        }
                           unlink(c->tempfile);
   			c = NULL;
                       }
  
  
  

Mime
View raw message