You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@hyperreal.org on 1998/06/20 13:20:40 UTC

cvs commit: apache-1.3/src/os/win32 os.h

coar        98/06/20 04:20:40

  Modified:    src      CHANGES
               src/include conf.h
               src/modules/standard mod_autoindex.c
               src/os/win32 os.h
  Log:
  	Whoops, IndexIgnore has the same issues on OS/2 case-aware
  	filesystems as on Win32.  Add a new define so any other
  	platforms can set it as needed.  This stuff in mod_autoindex
  	is still not as good as having some OS-aware routine do filename
  	pattern matching, but it at least fixes the problem for now.
  
  Revision  Changes    Path
  1.928     +2 -1      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.927
  retrieving revision 1.928
  diff -u -r1.927 -r1.928
  --- CHANGES	1998/06/19 21:02:30	1.927
  +++ CHANGES	1998/06/20 11:20:36	1.928
  @@ -5,7 +5,8 @@
        [Ken Coar]
   
     *) IndexIgnore should be case-blind on Win32 (and any other case-aware
  -     but case-insensitive platforms).  [Ken Coar] PR#2455
  +     but case-insensitive platforms).  New #define for this added to conf.h
  +     (CASE_BLIND_FILESYSTEM).  [Ken Coar] PR#2455
   
     *) Enable DSO support for OpenBSD in general, not only for 2.x, because it
        also works for OpenBSD 1.x. [Ralf S. Engelschall]
  
  
  
  1.217     +1 -0      apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.216
  retrieving revision 1.217
  diff -u -r1.216 -r1.217
  --- conf.h	1998/06/17 07:10:42	1.216
  +++ conf.h	1998/06/20 11:20:38	1.217
  @@ -690,6 +690,7 @@
   #define NEED_STRNCASECMP
   #define NO_SETSID
   #define NO_TIMES
  +#define CASE_BLIND_FILESYSTEM
   /* Add some drive name support */
   #define chdir _chdir2
   #include <sys/time.h>
  
  
  
  1.84      +6 -4      apache-1.3/src/modules/standard/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v
  retrieving revision 1.83
  retrieving revision 1.84
  diff -u -r1.83 -r1.84
  --- mod_autoindex.c	1998/06/19 13:31:30	1.83
  +++ mod_autoindex.c	1998/06/20 11:20:39	1.84
  @@ -534,20 +534,22 @@
   	    ap++;
   	}
   
  -#ifndef WIN32
  +#ifndef CASE_BLIND_FILESYSTEM
   	if (!ap_strcmp_match(path, p->apply_path)
   	    && !ap_strcmp_match(tt, ap)) {
   	    return 1;
   	}
  -#else  /* !WIN32 */
  +#else  /* !CASE_BLIND_FILESYSTEM */
   	/*
  -	 * On Win32, the match must be case-blind.
  +	 * On some platforms, the match must be case-blind.  This is really
  +	 * a factor of the filesystem involved, but we can't detect that
  +	 * reliably - so we have to granularise at the OS level.
   	 */
   	if (!ap_strcasecmp_match(path, p->apply_path)
   	    && !ap_strcasecmp_match(tt, ap)) {
   	    return 1;
   	}
  -#endif /* !WIN32 */
  +#endif /* !CASE_BLIND_FILESYSTEM */
       }
       return 0;
   }
  
  
  
  1.19      +1 -0      apache-1.3/src/os/win32/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/os.h,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- os.h	1998/05/07 12:24:31	1.18
  +++ os.h	1998/06/20 11:20:40	1.19
  @@ -22,6 +22,7 @@
   #ifndef STRICT
    #define STRICT
   #endif
  +#define CASE_BLIND_FILESYSTEM
   #define NO_UNISTD_H
   #define NO_WRITEV
   #define NO_SETSID