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:03:39 GMT
wrowe       2003/01/13 19:03:39

  Modified:    server   Tag: APACHE_2_0_BRANCH core.c config.c
  Log:
    Already committed to 2.1-dev, backport the fix for Win32 wildcard patterns
    in the <Directory > block directive, and note a similar bug in Includes *.conf.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.225.2.2 +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.225.2.1
  retrieving revision 1.225.2.2
  diff -u -r1.225.2.1 -r1.225.2.2
  --- core.c	9 Jan 2003 16:27:25 -0000	1.225.2.1
  +++ core.c	14 Jan 2003 03:03:38 -0000	1.225.2.2
  @@ -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.156.2.1 +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.156
  retrieving revision 1.156.2.1
  diff -u -r1.156 -r1.156.2.1
  --- config.c	12 Sep 2002 20:04:07 -0000	1.156
  +++ config.c	14 Jan 2003 03:03:39 -0000	1.156.2.1
  @@ -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