You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@apache.org on 2002/02/02 17:40:52 UTC

cvs commit: httpd-2.0/modules/experimental mod_cache.c mod_cache.h

stoddard    02/02/02 08:40:52

  Modified:    modules/experimental mod_cache.c mod_cache.h
  Log:
  Remove the CACHE_IN filter is we are not doing caching
  
  Revision  Changes    Path
  1.23      +5 -0      httpd-2.0/modules/experimental/mod_cache.c
  
  Index: mod_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_cache.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- mod_cache.c	2 Feb 2002 16:20:33 -0000	1.22
  +++ mod_cache.c	2 Feb 2002 16:40:52 -0000	1.23
  @@ -316,6 +316,10 @@
       ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
               "cache: running CACHE_OUT filter");
   
  +    /* XXX: Wouldn't it be better to do read_entity_headers when we 
  +     * opened the cache entity? This would better accomodate implementations 
  +     * that stored headers and the entity body in seperate files.
  +     */
       cache_read_entity_headers(cache->handle, r);    
       cache_read_entity_body(cache->handle, bb);
   
  @@ -392,6 +396,7 @@
   
       /* check first whether running this filter has any point or not */
       if(r->no_cache) {
  +	ap_remove_output_filter(f);
           return ap_pass_brigade(f->next, in);
       }
   
  
  
  
  1.14      +1 -1      httpd-2.0/modules/experimental/mod_cache.h
  
  Index: mod_cache.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_cache.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_cache.h	25 Jan 2002 20:09:33 -0000	1.13
  +++ mod_cache.h	2 Feb 2002 16:40:52 -0000	1.14
  @@ -117,7 +117,7 @@
   
   /* default completion is 60% */
   #define DEFAULT_CACHE_COMPLETION (60)
  -
  +#define MAX_URL_LENGTH 1024
   #define MSEC_ONE_DAY ((apr_time_t)(86400*APR_USEC_PER_SEC)) /* one day, in microseconds */
   #define MSEC_ONE_HR  ((apr_time_t)(3600*APR_USEC_PER_SEC))  /* one hour, in microseconds */
   #define MSEC_ONE_MIN  ((apr_time_t)(60*APR_USEC_PER_SEC))   /* one minute, in microseconds */