Received: by taz.hyperreal.com (8.8.3/V2.0) id MAA26684;
 Sun, 12 Jan 1997 12:12:02 -0800 (PST)
Received: by taz.hyperreal.com (8.8.3/V2.0) id MAA26665;
 Sun, 12 Jan 1997 12:11:57 -0800 (PST)
Date: Sun, 12 Jan 1997 12:11:57 -0800 (PST)
From: Randy Terbush <randy@hyperreal.com>
Message-Id: <199701122011.MAA26665@taz.hyperreal.com>
To: apache-cvs@hyperreal.com
Subject: cvs commit: apache/src CHANGES mod_dir.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@hyperreal.com

randy       97/01/12 12:11:56

  Modified:    src       CHANGES mod_dir.c
  Log:
  Log reason when mod_dir returns access HTTP_FORBIDDEN
  Reviewed by: Rob Hartill, Randy Terbush
  Submitted by: Ken the Rodent of Unusual Size
  
  Revision  Changes    Path
  1.120     +4 -0      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.119
  retrieving revision 1.120
  diff -C3 -r1.119 -r1.120
  *** CHANGES	1997/01/12 20:01:20	1.119
  --- CHANGES	1997/01/12 20:11:53	1.120
  ***************
  *** 1,7 ****
  --- 1,11 ----
    Changes with Apache 1.2b5
    
  +   *) Log reason when mod_dir returns access HTTP_FORBIDDEN
  +      [Ken the Rodent]
  + 
      *) Properly check errno to prevent display of a directory index
         when server receives a long enough URL to confuse stat().
  +      [Marc Slemko]
    
      *) Several security enhancements to suexec wrapper. It is _highly_
         recommended that previously installed versions of the wrapper
  
  
  
  1.20      +7 -2      apache/src/mod_dir.c
  
  Index: mod_dir.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_dir.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -C3 -r1.19 -r1.20
  *** mod_dir.c	1997/01/12 20:01:21	1.19
  --- mod_dir.c	1997/01/12 20:11:53	1.20
  ***************
  *** 693,699 ****
        char *tmp;
        int dir_opts = find_opts(dir_conf, r);
    
  !     if(!(d=opendir(name))) return HTTP_FORBIDDEN;
    
        r->content_type = "text/html";
        
  --- 693,702 ----
        char *tmp;
        int dir_opts = find_opts(dir_conf, r);
    
  !     if(!(d=opendir(name))) {
  !         log_reason ("Can't open directory for index", r->filename, r);
  !         return HTTP_FORBIDDEN;
  !     }
    
        r->content_type = "text/html";
        
  ***************
  *** 833,840 ****
    
        if (allow_opts & OPT_INDEXES) 
            return index_directory (r, d);
  !     else
            return HTTP_FORBIDDEN;
    }
    
    
  --- 836,845 ----
    
        if (allow_opts & OPT_INDEXES) 
            return index_directory (r, d);
  !     else {
  !         log_reason ("Directory index forbidden by rule", r->filename, r);
            return HTTP_FORBIDDEN;
  +     }
    }