httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@hyperreal.org
Subject cvs commit: apache-1.3/src/os/win32 os.h
Date Sun, 07 Mar 1999 13:13:56 GMT
fielding    99/03/07 05:13:56

  Modified:    src      CHANGES
               src/main http_core.c http_request.c
               src/modules/standard mod_include.c mod_userdir.c
               src/os/os2 os.h
               src/os/win32 os.h
  Log:
  Replaced use of WIN32 define with HAVE_DRIVE_LETTERS to indicate
  when the OS allows a DOS drive letter within pathnames.
  
  Submitted by:	Brian Havard <brianh@kheldar.apana.org.au>
  Reviewed by:	Roy Fielding
  
  Revision  Changes    Path
  1.1260    +3 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1259
  retrieving revision 1.1260
  diff -u -r1.1259 -r1.1260
  --- CHANGES	1999/03/04 19:28:38	1.1259
  +++ CHANGES	1999/03/07 13:13:50	1.1260
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.5
   
  +  *) Replaced use of WIN32 define with HAVE_DRIVE_LETTERS to indicate
  +     when the OS allows a DOS drive letter within pathnames.  [Brian Havard]
  +
     *) Add %V to mod_log_config, this logs the hostname according to the
        UseCanonicalName setting (this is the pre-1.3.4 behaviour of
        %v).  Useful for mass vhosting.  [Tony Finch <dot@dotat.at>]
  
  
  
  1.252     +1 -1      apache-1.3/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v
  retrieving revision 1.251
  retrieving revision 1.252
  diff -u -r1.251 -r1.252
  --- http_core.c	1999/02/24 09:33:37	1.251
  +++ http_core.c	1999/03/07 13:13:52	1.252
  @@ -348,7 +348,7 @@
    * See directory_walk().
    */
   
  -#if defined(OS2) || defined(WIN32)
  +#ifdef HAVE_DRIVE_LETTERS
   #define IS_SPECIAL(entry_core)	\
       ((entry_core)->r != NULL \
   	|| ((entry_core)->d[0] != '/' && (entry_core)->d[1] != ':'))
  
  
  
  1.145     +5 -5      apache-1.3/src/main/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_request.c,v
  retrieving revision 1.144
  retrieving revision 1.145
  diff -u -r1.144 -r1.145
  --- http_request.c	1999/01/09 21:37:56	1.144
  +++ http_request.c	1999/03/07 13:13:52	1.145
  @@ -178,8 +178,8 @@
       char *end = &path[strlen(path)];
       char *last_cp = NULL;
       int rv;
  -#ifdef WIN32
  -    BOOL bStripSlash=TRUE;
  +#ifdef HAVE_DRIVE_LETTERS
  +    char bStripSlash=1;
   #endif
   
       if (r->finfo.st_mode) {
  @@ -187,12 +187,12 @@
   	return OK;
       }
   
  -#ifdef WIN32
  +#ifdef HAVE_DRIVE_LETTERS
       /* If the directory is x:\, then we don't want to strip
        * the trailing slash since x: is not a valid directory.
        */
       if (strlen(path) == 3 && path[1] == ':' && path[2] == '/')
  -        bStripSlash = FALSE;
  +        bStripSlash = 0;
   
   
       /* If UNC name == //machine/share/, do not 
  @@ -211,7 +211,7 @@
           }
       
           if (iCount == 4)
  -            bStripSlash = FALSE;
  +            bStripSlash = 0;
       }
   
       if (bStripSlash)
  
  
  
  1.111     +1 -1      apache-1.3/src/modules/standard/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_include.c,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -r1.110 -r1.111
  --- mod_include.c	1999/01/01 19:05:09	1.110
  +++ mod_include.c	1999/03/07 13:13:54	1.111
  @@ -628,7 +628,7 @@
    */
   static int is_only_below(const char *path)
   {
  -#if WIN32
  +#ifdef HAVE_DRIVE_LETTERS
       if (path[1] == ':')
   	return 0;
   #endif
  
  
  
  1.39      +1 -1      apache-1.3/src/modules/standard/mod_userdir.c
  
  Index: mod_userdir.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_userdir.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- mod_userdir.c	1999/01/01 19:05:15	1.38
  +++ mod_userdir.c	1999/03/07 13:13:54	1.39
  @@ -262,7 +262,7 @@
   
   	if (userdir[0] == '\0' || ap_os_is_path_absolute(userdir)) {
               if (x) {
  -#ifdef WIN32
  +#ifdef HAVE_DRIVE_LETTERS
                   /*
                    * Crummy hack. Need to figure out whether we have been
                    * redirected to a URL or to a file on some drive. Since I
  
  
  
  1.12      +1 -0      apache-1.3/src/os/os2/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/os2/os.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- os.h	1999/01/08 23:46:44	1.11
  +++ os.h	1999/03/07 13:13:55	1.12
  @@ -3,6 +3,7 @@
   
   #define PLATFORM "OS/2"
   #define HAVE_CANONICAL_FILENAME
  +#define HAVE_DRIVE_LETTERS
   
   /*
    * This file in included in all Apache source code. It contains definitions
  
  
  
  1.28      +1 -0      apache-1.3/src/os/win32/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/os.h,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- os.h	1999/01/08 23:46:47	1.27
  +++ os.h	1999/03/07 13:13:56	1.28
  @@ -34,6 +34,7 @@
   #define USE_MMAP_SCOREBOARD
   #define MULTITHREAD
   #define HAVE_CANONICAL_FILENAME
  +#define HAVE_DRIVE_LETTERS
   typedef int uid_t;
   typedef int gid_t;
   typedef int pid_t;
  
  
  

Mime
View raw message