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 core.c config.c
Date Tue, 14 Jan 2003 03:01:52 GMT
wrowe       2003/01/13 19:01:52

  Modified:    server   core.c config.c
  Log:
    Once again, allow <Directory "C:\Users\*\html_files"> or other wildcard
    patterns in Directory blocks.  Note a similar problem with Includes *.conf
  
  Revision  Changes    Path
  1.227     +6 -2      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.226
  retrieving revision 1.227
  diff -u -r1.226 -r1.227
  --- core.c	9 Dec 2002 22:19:26 -0000	1.226
  +++ core.c	14 Jan 2003 03:01:51 -0000	1.227
  @@ -1635,8 +1635,9 @@
           /*
            * Ensure that the pathname is canonical, and append the trailing /
            */
  -        if (apr_filepath_merge(&newpath, NULL, cmd->path,
  -                               APR_FILEPATH_TRUENAME, cmd->pool) != APR_SUCCESS) {
  +        apr_status_t rv = apr_filepath_merge(&newpath, NULL, cmd->path,
  +                                             APR_FILEPATH_TRUENAME, cmd->pool);
  +        if (rv != APR_SUCCESS && rv != APR_EPATHWILD) {
               return apr_pstrcat(cmd->pool, "<Directory \"", cmd->path,
                                  "\"> path is invalid.", NULL);
           }
  @@ -2191,6 +2192,9 @@
   {
       ap_directive_t *conftree = NULL;
       const char* conffile = ap_server_root_relative(cmd->pool, name);
  +
  +    /* XXX: ap_server_root_relative won't work on the wildcard pattern...
  +     */
       
       if (!conffile) {
           return apr_pstrcat(cmd->pool, "Invalid Include path ", 
  
  
  
  1.159     +3 -0      httpd-2.0/server/config.c
  
  Index: config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/config.c,v
  retrieving revision 1.158
  retrieving revision 1.159
  diff -u -r1.158 -r1.159
  --- config.c	9 Dec 2002 14:43:32 -0000	1.158
  +++ config.c	14 Jan 2003 03:01:52 -0000	1.159
  @@ -1445,6 +1445,9 @@
       ap_configfile_t *cfp;
       int ispatt;
   
  +    /* XXX: lstat() won't work on the wildcard pattern...
  +     */
  +
       /* don't require conf/httpd.conf if we have a -C or -c switch */
       if ((ap_server_pre_read_config->nelts
           || ap_server_post_read_config->nelts)
  
  
  

Mime
View raw message