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-1.0 CHANGES mod_proxy.c proxy_http.c proxy_util.c
Date Tue, 25 Sep 2001 04:17:54 GMT
chuck       01/09/24 21:17:54

  Modified:    module-1.0 CHANGES mod_proxy.c proxy_http.c proxy_util.c
  Log:
  mirror fixes for PR#8090,8067,7383,6585,6055
  
  Revision  Changes    Path
  1.4       +9 -0      httpd-proxy/module-1.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-1.0/CHANGES,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CHANGES	2001/06/08 10:14:17	1.3
  +++ CHANGES	2001/09/25 04:17:54	1.4
  @@ -1,6 +1,15 @@
   
   mod_proxy changes for httpd 1.3.21-dev
   
  +  *) fix reverse proxy cookie passthrough
  +     [Brian Eidelman <beidelman@netegrity.com>] PR#6055
  +
  +  *) fix CacheForceCompletion directive
  +     [Alexey Panchenko <panchenko@liwest.ru>] PR#8090
  +
  +  *) close origin server connection when client aborts
  +     [Alexey Panchenko <panchenko@liwest.ru>] PR#8067,7383,6585
  +
     *) Changes for 1.3.20+
        [Chuck Murcko <chuck@topsail.org>]
        
  
  
  
  1.2       +1 -1      httpd-proxy/module-1.0/mod_proxy.c
  
  Index: mod_proxy.c
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-1.0/mod_proxy.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mod_proxy.c	2001/06/07 19:50:57	1.1
  +++ mod_proxy.c	2001/09/25 04:17:54	1.2
  @@ -857,7 +857,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.3       +3 -1      httpd-proxy/module-1.0/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-1.0/proxy_http.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- proxy_http.c	2001/06/08 07:39:08	1.2
  +++ proxy_http.c	2001/09/25 04:17:54	1.3
  @@ -466,7 +466,9 @@
   
   	/* strip hop-by-hop headers defined by Connection */
   	ap_proxy_clear_connection(p, resp_hdrs);
  -    }
  +        /* Now add out bound headers set by other modules */
  +        resp_hdrs = ap_overlay_tables(r->pool, r->err_headers_out, resp_hdrs);
  +}
       else {
           /* an http/0.9 response */
   	backasswards = 1;
  
  
  
  1.6       +3 -1      httpd-proxy/module-1.0/proxy_util.c
  
  Index: proxy_util.c
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-1.0/proxy_util.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- proxy_util.c	2001/06/13 20:17:09	1.5
  +++ proxy_util.c	2001/09/25 04:17:54	1.6
  @@ -601,7 +601,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
  @@ -611,8 +611,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