httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwool...@apache.org
Subject cvs commit: httpd-2.0/server util.c
Date Fri, 24 Aug 2001 01:26:31 GMT
jwoolley    01/08/23 18:26:31

  Modified:    server   util.c
  Log:
  I don't know if this is the Right Way, but it certainly does make things
  work better right now.  httpd-test is much much happier with this patch
  (ie, we can serve pages again :)  I'm still seeing issues with mod_include,
  but that's probably a different problem... will investigate.
  
  Submitted by:	Doug MacEachern
  
  Revision  Changes    Path
  1.111     +7 -2      httpd-2.0/server/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/util.c,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -d -u -r1.110 -r1.111
  --- util.c	2001/08/24 00:59:08	1.110
  +++ util.c	2001/08/24 01:26:31	1.111
  @@ -259,8 +259,13 @@
   {
       const char *newpath;
       const char *ourdir = dir;
  -    if (apr_filepath_root(&newpath, &dir, 0, p) != APR_SUCCESS
  -            || strncmp(newpath, ourdir, strlen(newpath)) != 0) {
  +    apr_status_t rv = apr_filepath_root(&newpath, &dir, 0, p);
  +
  +    if (rv == APR_EABSOLUTE) {
  +        return 1;
  +    }
  +
  +    if (rv != APR_SUCCESS || strncmp(newpath, ourdir, strlen(newpath)) != 0) {
           return 0;
       }
       return 1;
  
  
  

Mime
View raw message