httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/experimental cache_storage.c mod_cache.c mod_cache.h mod_disk_cache.c mod_mem_cache.c
Date Sat, 03 Aug 2002 22:39:42 GMT
wrowe       2002/08/03 15:39:42

  Modified:    modules/experimental cache_storage.c mod_cache.c mod_cache.h
                        mod_disk_cache.c mod_mem_cache.c
  Log:
    We describe body lengths throughout apr in apr_off_t lengths.  While we
    all agree we won't ever cache an entity that huge in memory, the disk
    cache is another matter [e.g. if we cache an existing file.]
  
  Revision  Changes    Path
  1.26      +2 -2      httpd-2.0/modules/experimental/cache_storage.c
  
  Index: cache_storage.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/cache_storage.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- cache_storage.c	23 Jun 2002 06:10:00 -0000	1.25
  +++ cache_storage.c	3 Aug 2002 22:39:42 -0000	1.26
  @@ -108,7 +108,7 @@
    * decide whether or not it wants to cache this particular entity.
    * If the size is unknown, a size of -1 should be set.
    */
  -int cache_create_entity(request_rec *r, const char *types, char *url, apr_size_t size)
  +int cache_create_entity(request_rec *r, const char *types, char *url, apr_off_t size)
   {
       cache_handle_t *h = apr_pcalloc(r->pool, sizeof(cache_handle_t));
       const char *next = types;
  @@ -300,7 +300,7 @@
   
   APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(cache, CACHE, int, create_entity, 
                                         (cache_handle_t *h, request_rec *r, const char *type,

  -                                      const char *urlkey, apr_size_t len),
  +                                      const char *urlkey, apr_off_t len),
                                         (h, r, type,urlkey,len),DECLINED)
   APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(cache, CACHE, int, open_entity,  
                                         (cache_handle_t *h, request_rec *r, const char *type,

  
  
  
  1.51      +1 -1      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.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- mod_cache.c	3 Aug 2002 19:36:33 -0000	1.50
  +++ mod_cache.c	3 Aug 2002 22:39:42 -0000	1.51
  @@ -409,7 +409,7 @@
       const char *cc_out = apr_table_get(r->headers_out, "Cache-Control");
       const char *exps, *lastmods, *dates, *etag;
       apr_time_t exp, date, lastmod, now;
  -    apr_size_t size;
  +    apr_off_t size;
       cache_info *info;
       void *sconf = r->server->module_config;
       cache_server_conf *conf =
  
  
  
  1.30      +2 -2      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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- mod_cache.h	23 Jun 2002 06:10:00 -0000	1.29
  +++ mod_cache.h	3 Aug 2002 22:39:42 -0000	1.30
  @@ -268,7 +268,7 @@
    * cache_storage.c
    */
   int cache_remove_url(request_rec *r, const char *types, char *url);
  -int cache_create_entity(request_rec *r, const char *types, char *url, apr_size_t size);
  +int cache_create_entity(request_rec *r, const char *types, char *url, apr_off_t size);
   int cache_remove_entity(request_rec *r, const char *types, cache_handle_t *h);
   int cache_select_url(request_rec *r, const char *types, char *url);
   apr_status_t cache_generate_key_default( request_rec *r, apr_pool_t*p, char**key );
  @@ -310,7 +310,7 @@
   
   APR_DECLARE_EXTERNAL_HOOK(cache, CACHE, int, create_entity, 
                             (cache_handle_t *h, request_rec *r, const char *type,
  -                           const char *urlkey, apr_size_t len))
  +                           const char *urlkey, apr_off_t len))
   APR_DECLARE_EXTERNAL_HOOK(cache, CACHE, int, open_entity,  
                             (cache_handle_t *h, request_rec *r, const char *type,
                              const char *urlkey))
  
  
  
  1.37      +1 -1      httpd-2.0/modules/experimental/mod_disk_cache.c
  
  Index: mod_disk_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_disk_cache.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- mod_disk_cache.c	17 Jul 2002 14:52:36 -0000	1.36
  +++ mod_disk_cache.c	3 Aug 2002 22:39:42 -0000	1.37
  @@ -312,7 +312,7 @@
   static int create_entity(cache_handle_t *h, request_rec *r,
                            const char *type, 
                            const char *key, 
  -                         apr_size_t len)
  +                         apr_off_t len)
   { 
       disk_cache_conf *conf = ap_get_module_config(r->server->module_config, 
                                                    &disk_cache_module);
  
  
  
  1.79      +1 -1      httpd-2.0/modules/experimental/mod_mem_cache.c
  
  Index: mod_mem_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_mem_cache.c,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- mod_mem_cache.c	19 Jul 2002 02:24:26 -0000	1.78
  +++ mod_mem_cache.c	3 Aug 2002 22:39:42 -0000	1.79
  @@ -431,7 +431,7 @@
   static int create_entity(cache_handle_t *h, request_rec *r,
                            const char *type, 
                            const char *key, 
  -                         apr_size_t len) 
  +                         apr_off_t len) 
   {
       cache_object_t *obj, *tmp_obj;
       mem_cache_object_t *mobj;
  
  
  

Mime
View raw message