cvs commit: apache-2.0/src/modules/standard mod_cern_meta.c mod_expires.c mod_mime_magic.c mod_speling.c

[rb...@hyperreal.org]

rbb         00/01/07 07:52:25

  Modified:    src/modules/standard mod_cern_meta.c mod_expires.c
                        mod_mime_magic.c mod_speling.c
  Log:
  Fix the rest of the modules to work with the new APR stat structure.
  
  Revision  Changes    Path
  1.6       +2 -2      apache-2.0/src/modules/standard/mod_cern_meta.c
  
  Index: mod_cern_meta.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cern_meta.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_cern_meta.c	1999/12/31 20:32:35	1.5
  +++ mod_cern_meta.c	2000/01/07 15:52:18	1.6
  @@ -309,12 +309,12 @@
   
       /* if ./.web/$1.meta exists then output 'asis' */
   
  -    if (r->finfo.st_mode == 0) {
  +    if (r->finfo.protection == 0) {
   	return DECLINED;
       };
   
       /* is this a directory? */
  -    if (S_ISDIR(r->finfo.st_mode) || r->uri[strlen(r->uri) - 1] == '/') {
  +    if (S_ISDIR(r->finfo.protection) || r->uri[strlen(r->uri) - 1] == '/') {
   	return DECLINED;
       };
   
  
  
  
  1.7       +3 -3      apache-2.0/src/modules/standard/mod_expires.c
  
  Index: mod_expires.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_expires.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_expires.c	2000/01/06 19:19:36	1.6
  +++ mod_expires.c	2000/01/07 15:52:18	1.7
  @@ -403,7 +403,7 @@
       expires_dir_config *conf;
       char *code;
       char *timestr = NULL;
  -    ap_int64_t base;
  +    ap_ansi_time_t base;
       time_t additional;
       time_t expires;
       ap_time_t *finaltime = NULL;
  @@ -453,13 +453,13 @@
   
       switch (code[0]) {
       case 'M':
  -	if (r->finfo.st_mode == 0) { 
  +	if (r->finfo.protection == 0) { 
   	    /* file doesn't exist on disk, so we can't do anything based on
   	     * modification time.  Note that this does _not_ log an error.
   	     */
   	    return DECLINED;
   	}
  -        base = r->finfo.st_mtime;
  +        ap_get_ansitime(r->finfo.mtime, &base);
           additional = atoi(&code[1]);
           break;
       case 'A':
  
  
  
  1.12      +4 -4      apache-2.0/src/modules/standard/mod_mime_magic.c
  
  Index: mod_mime_magic.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_mime_magic.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_mime_magic.c	2000/01/04 19:01:02	1.11
  +++ mod_mime_magic.c	2000/01/07 15:52:18	1.12
  @@ -1448,7 +1448,7 @@
    */
   static int fsmagic(request_rec *r, const char *fn)
   {
  -    switch (r->finfo.st_mode & S_IFMT) {
  +    switch (r->finfo.protection & S_IFMT) {
       case S_IFDIR:
   	magic_rsl_puts(r, DIR_MAGIC_TYPE);
   	return DONE;
  @@ -1497,14 +1497,14 @@
   	break;
       default:
   	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, r,
  -		    MODNAME ": invalid mode 0%o.", (unsigned int)r->finfo.st_mode);
  +		    MODNAME ": invalid mode 0%o.", (unsigned int)r->finfo.protection);
   	return HTTP_INTERNAL_SERVER_ERROR;
       }
   
       /*
        * regular file, check next possibility
        */
  -    if (r->finfo.st_size == 0) {
  +    if (r->finfo.size == 0) {
   	magic_rsl_puts(r, MIME_TEXT_UNKNOWN);
   	return DONE;
       }
  @@ -2448,7 +2448,7 @@
       magic_server_config_rec *conf;
   
       /* the file has to exist */
  -    if (r->finfo.st_mode == 0 || !r->filename) {
  +    if (r->finfo.protection == 0 || !r->filename) {
   	return DECLINED;
       }
   
  
  
  
  1.7       +1 -1      apache-2.0/src/modules/standard/mod_speling.c
  
  Index: mod_speling.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_speling.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_speling.c	1999/10/23 21:20:16	1.6
  +++ mod_speling.c	2000/01/07 15:52:21	1.7
  @@ -244,7 +244,7 @@
       }
   
       /* We've already got a file of some kind or another */
  -    if (r->proxyreq || (r->finfo.st_mode != 0)) {
  +    if (r->proxyreq || (r->finfo.protection != 0)) {
           return DECLINED;
       }