httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject cvs commit: apache-1.3/src/main http_vhost.c
Date Sat, 24 Feb 2001 10:09:47 GMT
gstein      01/02/24 02:09:47

  Modified:    .        STATUS
               src      CHANGES
               src/main http_vhost.c
  Log:
  back out Dean's hostname-unescaping fix, pending a real fix across the
  board.
  
  See msgid: <Pine.LNX.4.33.0102231235031.11699-100000@twinlark.arctic.org>
  
  Revision  Changes    Path
  1.928     +22 -26    apache-1.3/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.927
  retrieving revision 1.928
  diff -u -u -r1.927 -r1.928
  --- STATUS	2001/02/23 22:10:32	1.927
  +++ STATUS	2001/02/24 10:09:43	1.928
  @@ -1,29 +1,25 @@
  -  1.3 STATUS:
  -  Last modified at [$Date: 2001/02/23 22:10:32 $]
  +APACHE 1.3 STATUS:						-*-text-*-
  +  Last modified at [$Date: 2001/02/24 10:09:43 $]
   
   Release:
   
  -    1.3.19-dev: Proposal: tag and roll on Mon Feb 26, if the
  -            host unescape patch in reverted (or fixed).
  -	    Martin offers to be RM.
  -    1.3.18: Tagged and rolled on Feb 19, 2001.
  -            Not released because of an incorrect unescaping fix.
  -    1.3.17: Tagged and rolled late Jan 26, 2001
  -            announced Jan 29, 2001.
  -    1.3.16: Tagged and Rolled Jan 20, 2001.
  -            Not released because of vhosting bug.
  -    1.3.15: Not released. Pulled due to CVS dumping core during the
  -            tagging when it reached src/os/win32/
  -    1.3.14: Tagged & Rolled Oct 10, 2000.  Released and
  -            announced Oct 13, 2000. 
  -    1.3.13: Not released. Pulled in the "first minutes" due to
  -            a build bug in the Netware port.
  -    1.3.12: Tagged and rolled Feb. 23, 2000. Released and
  -            announced on the 25th.
  -    1.3.11: Tagged and rolled Jan. 19, 2000. Released and
  -            announced on the 21st.
  -    1.3.10: Not released. Pulled at "last minute" due to
  -            a build bug in the MPE port.
  +   1.3.19-dev: Proposal: tag and roll on Mon Feb 26.
  +               Martin offers to be RM.
  +   1.3.18: Not released.
  +             (Pulled because of an incorrect unescaping fix. t/r Feb 19, 2001)
  +   1.3.17: Tagged and rolled Jan 26, 2001. Announced Jan 29, 2001.
  +   1.3.16: Not released.
  +             (Pulled because of vhosting bug. t/r Jan 20, 2001)
  +   1.3.15: Not released.
  +             (Pulled due to CVS dumping core during the tagging when it
  +              reached src/os/win32/)
  +   1.3.14: Tagged and Rolled Oct 10, 2000.  Released/announced on the 13th.
  +   1.3.13: Not released.
  +             (Pulled in the "first minutes" due to a Netware build bug)
  +   1.3.12: Tagged and rolled Feb. 23, 2000. Released/announced on the 25th.
  +   1.3.11: Tagged and rolled Jan. 19, 2000. Released/announced on the 21st.
  +   1.3.10: Not released.
  +             (Pulled at "last minute" due to a build bug in the MPE port)
       1.3.9: Tagged and rolled on Aug. 16. Released and announced on 19th.
       1.3.8: Not released.
       1.3.7: Not released.
  @@ -35,7 +31,7 @@
       1.3.1: Tagged and rolled on July 19. Announced and released.
       1.3.0: Tagged and rolled on June 1.  Announced and released on the 6th.
              
  -    2.0  : In pre-alpha development, see httpd-2.0 repository
  +    2.0  : In alpha development, see httpd-2.0 repository
   
   RELEASE SHOWSTOPPERS:
   
  @@ -43,8 +39,8 @@
   
       * Dean's "unescaping hell" (unescaping the various URI components
         at the right time and place, esp. unescaping the host name).
  -      See Message-ID: <Pine.LNX.4.33.0102231235031.11699-100000@twinlark.arctic.org>
  -      Status: 1.3.18 "fix" needs to be reverted.
  +        Message-ID: <Pine.LNX.4.33.0102231235031.11699-100000@twinlark.arctic.org>
  +        Status:
   
       * Martin observed a core dump because a ipaddr_chain struct contains
         a NULL-"server" pointer when being dereferenced by invoking "httpd -S".
  
  
  
  1.1655    +0 -3      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1654
  retrieving revision 1.1655
  diff -u -u -r1.1654 -r1.1655
  --- CHANGES	2001/02/23 16:37:24	1.1654
  +++ CHANGES	2001/02/24 10:09:45	1.1655
  @@ -25,9 +25,6 @@
     *) Sporadic core dump in ap_default_port_for_scheme() with
        internal requests fixed by [Jeffrey W. Baker <jwbaker@acm.org>]
   
  -  *) 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.30      +3 -7      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.29
  retrieving revision 1.30
  diff -u -u -r1.29 -r1.30
  --- http_vhost.c	2001/02/21 00:58:56	1.29
  +++ http_vhost.c	2001/02/24 10:09:46	1.30
  @@ -703,16 +703,12 @@
   static void fix_hostname(request_rec *r)
   {
       char *host = ap_palloc(r->pool, strlen(r->hostname) + 1);
  -    char *src;
  +    const char *src;
       char *dst;
   
       /* check and copy the host part */
  -    src = ap_pstrdup(r->pool, r->hostname);
  -    r->hostname = src;
  -    /* unescape the hostname first */
  -    if (ap_unescape_url(src) != OK) {
  -	goto bad;
  -    }
  +    src = r->hostname;
  +
       dst = host;
       while (*src) {
   	if (*src == '.') {
  
  
  

Mime
View raw message