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

[jim]

jim         98/09/25 08:42:13

  Modified:    src/main http_config.c
  Log:
  Change the order... Always allow valid 'f'
  
  Revision  Changes    Path
  1.130     +2 -5      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.129
  retrieving revision 1.130
  diff -u -r1.129 -r1.130
  --- http_config.c     1998/09/25 15:26:05     1.129
  +++ http_config.c     1998/09/25 15:42:12     1.130
  @@ -1229,10 +1229,7 @@
        filename = ap_make_full_path(r->pool, d, w);
        f = ap_pcfg_openfile(r->pool, filename);
       }
  -    if (!access_name[0]) {
  -     dc = NULL;
  -    }
  -    else if (f) {
  +    if (f) {
        dc = ap_create_per_dir_config(r->pool);
   
        parms.config_file = f;
  @@ -1250,7 +1247,7 @@
        *result = dc;
       }
       else {
  -     if (errno == ENOENT || errno == ENOTDIR)
  +     if (errno == ENOENT || errno == ENOTDIR || (!access_name[0]))
            dc = NULL;
        else {
            ap_log_rerror(APLOG_MARK, APLOG_CRIT, r,