Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 16 Oct 2001 23:49:25 -0000
Message-ID: <20011016234925.7277.qmail@icarus.apache.org>
From: wrowe@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/mappers mod_vhost_alias.c

wrowe       01/10/16 16:49:25

  Modified:    modules/mappers mod_vhost_alias.c
  Log:
    Already committed in similar form to Apache 1.3.22-dev, this patch allows
    Win32/OS2/Netware paths to work with mod_vhost_alias.
  
  Revision  Changes    Path
  1.27      +9 -2      httpd-2.0/modules/mappers/mod_vhost_alias.c
  
  Index: mod_vhost_alias.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_vhost_alias.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- mod_vhost_alias.c	2001/10/06 04:41:37	1.26
  +++ mod_vhost_alias.c	2001/10/16 23:49:25	1.27
  @@ -193,9 +193,9 @@
   	return "INTERNAL ERROR: unknown command info";
       }
   
  -    if (*map != '/') {
  +    if (!ap_os_is_path_absolute(cmd->pool, map)) {
   	if (strcasecmp(map, "none")) {
  -	    return "format string must start with '/' or be 'none'";
  +	    return "format string must be an absolute path, or 'none'";
   	}
   	*pmap = NULL;
   	*pmode = VHOST_ALIAS_NONE;
  @@ -413,6 +413,7 @@
       if (last == '/') {
   	++uri;
       }
  +
       if (r->filename) {
   	r->filename = apr_pstrcat(r->pool, r->filename, buf, uri, NULL);
       }
  @@ -461,6 +462,12 @@
   	return DECLINED;
       }
   
  +    /* ### There is an optimization available here to determine the
  +     * absolute portion of the path from the server config phase, 
  +     * through the first % segment, and note that portion of the path
  +     * canonical_path buffer.
  +     */
  +    r->canonical_filename = "";
       vhost_alias_interpolate(r, name, map, uri);
   
       if (cgi) {