httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dean Gaudet <dgau...@hyperreal.org>
Subject cvs commit: apachen/src/main http_core.c http_request.c
Date Thu, 11 Sep 1997 18:46:47 GMT
dgaudet     97/09/11 11:46:47

  Modified:    src/main http_core.c http_request.c
  Log:
  I know we're about to commit os abstraction, but this bug bugs me.  This
  fixes a bug I introduced with the directory_walk optimization where I
  test absolute paths in a non-portable way.
  
  Revision  Changes    Path
  1.120     +6 -0      apachen/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/http_core.c,v
  retrieving revision 1.119
  retrieving revision 1.120
  diff -u -r1.119 -r1.120
  --- http_core.c	1997/09/09 18:39:17	1.119
  +++ http_core.c	1997/09/11 18:46:44	1.120
  @@ -267,8 +267,14 @@
    * See directory_walk().
    */
   
  +#if defined(__EMX__) || defined(WIN32)
  +#define IS_SPECIAL(entry_core)	\
  +    ((entry_core)->r != NULL \
  +	|| ((entry_core)->d[0] != '/' && (entry_core)->d[1] != ':'))
  +#else
   #define IS_SPECIAL(entry_core)	\
       ((entry_core)->r != NULL || (entry_core)->d[0] != '/')
  +#endif
   
   /* We need to do a stable sort, qsort isn't stable.  So to make it stable
    * we'll be maintaining the original index into the list, and using it
  
  
  
  1.82      +4 -3      apachen/src/main/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/http_request.c,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- http_request.c	1997/08/31 21:28:53	1.81
  +++ http_request.c	1997/09/11 18:46:45	1.82
  @@ -383,10 +383,11 @@
   	    entry_dir = entry_core->d;
   
   	    if (entry_core->r
  -/* FIXME: Temporarily removed, pending an explanation of function, in order to
  -          fix Win32 [Ben]
  +#if defined(__EMX__) || defined(WIN32)
  +		|| (entry_core[0] != '/' && entry_core[1] != ':')
  +#else
   		|| entry_dir[0] != '/'
  -*/
  +#endif
   		|| entry_core->d_components > i) break;
   
   	    this_conf = NULL;
  
  
  

Mime
View raw message