cvs commit: apache-1.3/src/main http_config.c

[jim]

jim         98/09/25 08:26:06

  Modified:    src      CHANGES
               src/main http_config.c
  Log:
  Submitted by: Roy Fielding
  Reviewed by:  Jim Jagielski
  
  Revision  Changes    Path
  1.1078    +3 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1077
  retrieving revision 1.1078
  diff -u -r1.1077 -r1.1078
  --- CHANGES   1998/09/24 17:25:53     1.1077
  +++ CHANGES   1998/09/25 15:26:03     1.1078
  @@ -1,4 +1,7 @@
   Changes with Apache 1.3.3
  + 
  +  *) Non-existant .htaccess files being returned as FORBIDDEN instead
  +     of not-existing. [Roy Fielding]
   
     *) OS/2: The new header tests get things right, need to update
        ap_config.h.  [Brian Havard]
  
  
  
  1.129     +4 -1      apache-1.3/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v
  retrieving revision 1.128
  retrieving revision 1.129
  diff -u -r1.128 -r1.129
  --- http_config.c     1998/09/21 21:09:47     1.128
  +++ http_config.c     1998/09/25 15:26:05     1.129
  @@ -1229,7 +1229,10 @@
        filename = ap_make_full_path(r->pool, d, w);
        f = ap_pcfg_openfile(r->pool, filename);
       }
  -    if (f) {
  +    if (!access_name[0]) {
  +     dc = NULL;
  +    }
  +    else if (f) {
        dc = ap_create_per_dir_config(r->pool);
   
        parms.config_file = f;