Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 17 Feb 2001 11:17:48 -0000
Message-ID: <20010217111748.29856.qmail@apache.org>
From: dgaudet@apache.org
To: apache-1.3-cvs@apache.org
Subject: cvs commit: apache-1.3/src/main http_vhost.c

dgaudet     01/02/17 03:17:47

  Modified:    src      CHANGES
               src/main http_vhost.c
  Log:
  we have to unescape the hostname at some point... this seems to be the
  easiest.  (having just gone through all the parsing code again i'm
  thinking it would have been nice to have all the parsing and validity
  checks in one place.)
  
  Revision  Changes    Path
  1.1649    +3 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1648
  retrieving revision 1.1649
  diff -u -r1.1648 -r1.1649
  --- CHANGES	2001/02/16 14:27:14	1.1648
  +++ CHANGES	2001/02/17 11:17:40	1.1649
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.18
   
  +  *) Escapes in hostnames such as www.%61rctic.org were not handled
  +     properly.  [Dean Gaudet]
  +
     *) PORT: Allow for build under latest dev. version of NonStopUX
        on Compaq. [Tom Bates <tom.bates@compaq.com>]
   
  
  
  
  1.26      +4 -0      apache-1.3/src/main/http_vhost.c
  
  Index: http_vhost.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_vhost.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- http_vhost.c	2001/01/23 14:14:06	1.25
  +++ http_vhost.c	2001/02/17 11:17:45	1.26
  @@ -705,6 +705,10 @@
   
       /* check and copy the host part */
       src = r->hostname;
  +    /* unescape the hostname first */
  +    if (ap_unescape_url(src) != OK) {
  +	goto bad;
  +    }
       dst = host;
       while (*src) {
   	if (*src == '.') {