Received: by taz.hyperreal.com (8.8.3/V2.0) id KAA14077;
 Tue, 24 Dec 1996 10:48:39 -0800 (PST)
Received: by taz.hyperreal.com (8.8.3/V2.0) id KAA14065;
 Tue, 24 Dec 1996 10:48:34 -0800 (PST)
Date: Tue, 24 Dec 1996 10:48:34 -0800 (PST)
From: Randy Terbush <randy@hyperreal.com>
Message-Id: <199612241848.KAA14065@taz.hyperreal.com>
To: apache-cvs@hyperreal.com
Subject: cvs commit: apache/src CHANGES http_config.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@hyperreal.com

randy       96/12/24 10:48:34

  Modified:    src       CHANGES http_config.c
  Log:
  Remove requirement for ResourceConfig/AccessConfig directives if not
  using the 3 file config layout.
  Reviewed by: Chuck Murcko, Jim Jagielski
  
  Revision  Changes    Path
  1.95      +3 -0      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.94
  retrieving revision 1.95
  diff -C3 -r1.94 -r1.95
  *** CHANGES	1996/12/24 18:41:09	1.94
  --- CHANGES	1996/12/24 18:48:31	1.95
  ***************
  *** 1,5 ****
  --- 1,8 ----
    Changes with Apache 1.2b3:
    
  +   *) Remove requirement for ResourceConfig/AccessConfig if not using
  +      the three config file layout. [Randy Terbush]
  + 
      *) Add PASV mode to mod_proxy FTP handler. [Chuck Murcko]
    
      *) Changes to suexec wrapper to fix the following problems:
  
  
  
  1.37      +7 -0      apache/src/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_config.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -C3 -r1.36 -r1.37
  *** http_config.c	1996/12/05 00:33:24	1.36
  --- http_config.c	1996/12/24 18:48:32	1.37
  ***************
  *** 720,727 ****
  --- 720,734 ----
        FILE *cfg;
        const char *errmsg;
        cmd_parms parms;
  +     struct stat finfo;
        
        fname = server_root_relative (p, fname);
  + 
  +     if (!(strcmp(fname, server_root_relative(p, RESOURCE_CONFIG_FILE))) ||
  + 	!(strcmp(fname, server_root_relative(p, ACCESS_CONFIG_FILE)))) {
  + 	if (stat(fname, &finfo) == -1)
  + 	    return;
  +     }
        
        /* GCC's initialization extensions are soooo nice here... */