httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject cvs commit: apache-1.3/src/main http_core.c
Date Mon, 12 Feb 2001 09:59:26 GMT
martin      01/02/12 01:59:26

  Modified:    conf     httpd.conf-dist
               src      CHANGES
               src/main http_core.c
  Log:
  Trailing slashes (if they exist) are now removed from ServerRoot,
  because there were known problems with them.
  Submitted by:	"William A. Rowe, Jr." <wrowe@rowe-clan.net>
  
  Revision  Changes    Path
  1.67      +0 -2      apache-1.3/conf/httpd.conf-dist
  
  Index: httpd.conf-dist
  ===================================================================
  RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -u -r1.66 -r1.67
  --- httpd.conf-dist	2001/02/01 10:18:18	1.66
  +++ httpd.conf-dist	2001/02/12 09:59:23	1.67
  @@ -56,8 +56,6 @@
   # (available at <URL:http://www.apache.org/docs/mod/core.html#lockfile>);
   # you will save yourself a lot of trouble.
   #
  -# Do NOT add a slash at the end of the directory path.
  -#
   ServerRoot "@@ServerRoot@@"
   
   #
  
  
  
  1.1642    +4 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1641
  retrieving revision 1.1642
  diff -u -u -r1.1641 -r1.1642
  --- CHANGES	2001/02/12 07:51:02	1.1641
  +++ CHANGES	2001/02/12 09:59:24	1.1642
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.18
   
  +  *) Trailing slashes (if they exist) are now removed from ServerRoot,
  +     because there were known problems with them.
  +     ["William A. Rowe, Jr." <wrowe@rowe-clan.net>]
  +
     *) Changed ap_os_is_filename_valid on NetWare to accept 
        SERVER/VOLUME:/PATH/FILE as a valid filename pattern. 
        [Brad Nicholes <BNICHOLES@novell.com>]
  
  
  
  1.294     +3 -0      apache-1.3/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v
  retrieving revision 1.293
  retrieving revision 1.294
  diff -u -u -r1.293 -r1.294
  --- http_core.c	2001/01/15 17:04:57	1.293
  +++ http_core.c	2001/02/12 09:59:25	1.294
  @@ -2079,6 +2079,9 @@
       if (!ap_is_directory(arg)) {
           return "ServerRoot must be a valid directory";
       }
  +    /* ServerRoot is never '/' terminated */
  +    while (strlen(ap_server_root) > 1 && ap_server_root[strlen(ap_server_root)-1]
== '/')
  +        ap_server_root[strlen(ap_server_root)-1] = '\0';
       ap_cpystrn(ap_server_root, arg,
   	       sizeof(ap_server_root));
       return NULL;
  
  
  

Mime
View raw message