httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/server request.c
Date Thu, 30 Aug 2001 20:48:06 GMT
wrowe       01/08/30 13:48:06

  Modified:    server   request.c
  Log:
    Fix the new code (not currently enabled) for directory_walk
  
  Revision  Changes    Path
  1.37      +9 -10     httpd-2.0/server/request.c
  
  Index: request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/request.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- request.c	2001/08/27 10:23:11	1.36
  +++ request.c	2001/08/30 20:48:06	1.37
  @@ -669,7 +669,6 @@
       unsigned int seg;
       int res;
       ap_conf_vector_t *entry_config;
  -    ap_conf_vector_t *this_conf;
       core_dir_config *entry_core;
       apr_status_t rv;
       apr_size_t buflen;
  @@ -677,11 +676,13 @@
       char *delim;
   
       /*
  +     * XXX: Better (faster) tests needed!!!
  +     *
        * Are we dealing with a file? If not, the handler needed to register
        * a hook to escape from our walking the file.  Since they haven't, we
        * are going to assume the worst and refuse to proceed.
        */
  -    if (r->filename == NULL || !ap_os_is_path_absolute(r->filename)) {
  +    if (r->filename == NULL || !ap_os_is_path_absolute(r->pool, r->filename))
{
           ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
                         "Module bug?  Request filename path %s is missing or "
                         "or not absolute for uri %s", 
  @@ -715,13 +716,11 @@
           r->finfo.valid = APR_FINFO_TYPE;
           r->finfo.filetype = APR_DIR; /* It's the root, of course it's a dir */
       } else {
  -        if (r->filename == NULL || !ap_os_is_path_absolute(r->filename)) {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  -                          "Config bug?  Request filename path %s is invalid or "
  -                          "or not absolute for uri %s", 
  -                          r->filename, r->uri);
  -            return HTTP_INTERNAL_SERVER_ERROR;
  -        }
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                      "Config bug?  Request filename path %s is invalid or "
  +                      "or not absolute for uri %s", 
  +                      r->filename, r->uri);
  +        return HTTP_INTERNAL_SERVER_ERROR;
       }
   
       /*
  @@ -765,7 +764,7 @@
               if (entry_core->d_components
                     && (entry_core->d_is_fnmatch
                           ? (apr_fnmatch(entry_dir, r->filename, FNM_PATHNAME) != APR_SUCCESS)
  -                        : (strcmp(r->filename, entry_dir) != 0)) {
  +                        : (strcmp(r->filename, entry_dir) != 0))) {
                   continue;
               }
   
  
  
  

Mime
View raw message