httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/mappers mod_rewrite.c mod_rewrite.h
Date Sat, 03 Mar 2001 01:46:16 GMT
trawick     01/03/02 17:46:16

  Modified:    modules/mappers mod_rewrite.c mod_rewrite.h
  Log:
  Fix some APR-ization issues:
  
  1) we're using an apr_time_t file mtime, but trying to fit it in
     a time_t entry in the cache and in parameters to the cache
     access routines; use apr_time_t everywhere
  
  2) we need to use apr_fileperms_t instead of mode_t for APR
     file permissions
  
  PR:		6980
  
  Revision  Changes    Path
  1.74      +3 -3      httpd-2.0/modules/mappers/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.c,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- mod_rewrite.c	2001/02/18 16:07:31	1.73
  +++ mod_rewrite.c	2001/03/03 01:46:16	1.74
  @@ -3056,7 +3056,7 @@
       apr_status_t rc;
       piped_log *pl;
       int    rewritelog_flags = ( APR_WRITE | APR_APPEND | APR_CREATE );
  -    mode_t rewritelog_mode  = ( APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD );
  +    apr_fileperms_t rewritelog_mode  = ( APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD
);
   
       conf = ap_get_module_config(s->module_config, &rewrite_module);
   
  @@ -3626,7 +3626,7 @@
       return c;
   }
   
  -static void set_cache_string(cache *c, const char *res, int mode, time_t t,
  +static void set_cache_string(cache *c, const char *res, int mode, apr_time_t t,
                                char *key, char *value)
   {
       cacheentry ce;
  @@ -3639,7 +3639,7 @@
   }
   
   static char *get_cache_string(cache *c, const char *res, int mode,
  -                              time_t t, char *key)
  +                              apr_time_t t, char *key)
   {
       cacheentry *ce;
   
  
  
  
  1.24      +3 -7      httpd-2.0/modules/mappers/mod_rewrite.h
  
  Index: mod_rewrite.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- mod_rewrite.h	2001/02/16 04:26:40	1.23
  +++ mod_rewrite.h	2001/03/03 01:46:16	1.24
  @@ -114,10 +114,6 @@
   
   #include "ap_config.h"
   
  -#ifdef HAVE_TIME_H
  -#include <time.h>
  -#endif
  -
       /* Include from the Apache server ... */
   #define CORE_PRIVATE
   #include "httpd.h"
  @@ -304,7 +300,7 @@
        * a 4-way hash apr_table_t with LRU functionality
        */
   typedef struct cacheentry {
  -    time_t time;
  +    apr_time_t time;
       char  *key;
       char  *value;
   } cacheentry;
  @@ -452,9 +448,9 @@
   
       /* caching functions */
   static cache *init_cache(apr_pool_t *p);
  -static char  *get_cache_string(cache *c, const char *res, int mode, time_t mtime,
  +static char  *get_cache_string(cache *c, const char *res, int mode, apr_time_t mtime,
                                  char *key);
  -static void   set_cache_string(cache *c, const char *res, int mode, time_t mtime,
  +static void   set_cache_string(cache *c, const char *res, int mode, apr_time_t mtime,
                                  char *key, char *value);
   static cacheentry *retrieve_cache_string(cache *c, const char *res, char *key);
   static void   store_cache_string(cache *c, const char *res, cacheentry *ce);
  
  
  

Mime
View raw message