jorton 2004/09/20 12:28:48
Modified: perl-framework/t/conf extra.conf.in Added: perl-framework/t/htdocs/security/CAN-2004-0811 .htaccess index.html perl-framework/t/htdocs/security/CAN-2004-0811/sub index.html perl-framework/t/security CAN-2004-0811.t Log: Add test for CAN-2004-0811, Satsify merging regression in 2.0.51. Revision Changes Path 1.51 +10 -0 httpd-test/perl-framework/t/conf/extra.conf.in Index: extra.conf.in =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/conf/extra.conf.in,v retrieving revision 1.50 retrieving revision 1.51 diff -d -w -u -r1.50 -r1.51 --- extra.conf.in 20 Sep 2004 14:26:45 -0000 1.50 +++ extra.conf.in 20 Sep 2004 19:28:47 -0000 1.51 @@ -380,6 +380,16 @@ ## <Directory @SERVERROOT@/htdocs/security> AllowOverride All + Order allow,deny + Allow from all +</Directory> + +<Directory @SERVERROOT@/htdocs/security/CAN-2004-0811> + Options +Indexes +</Directory> + +<Directory @SERVERROOT@/htdocs/security/CAN-2004-0811/sub> + Satisfy Any </Directory> ## 1.1 httpd-test/perl-framework/t/htdocs/security/CAN-2004-0811/.htaccess Index: .htaccess =================================================================== AuthType Basic AuthName authany require valid-user 1.1 httpd-test/perl-framework/t/htdocs/security/CAN-2004-0811/index.html Index: index.html =================================================================== empty 1.1 httpd-test/perl-framework/t/htdocs/security/CAN-2004-0811/sub/index.html Index: index.html =================================================================== empty 1.1 httpd-test/perl-framework/t/security/CAN-2004-0811.t Index: CAN-2004-0811.t =================================================================== use strict; use warnings FATAL => 'all'; use Apache::Test; use Apache::TestUtil; use Apache::TestRequest; plan tests => 8, need_apache(2); my $rc; foreach my $y (1..4) { $rc = GET_RC("/security/CAN-2004-0811/sub/"); ok t_cmp($rc, 200, "subdir access allowed"); } foreach my $z (1..4) { $rc = GET_RC("/security/CAN-2004-0811/"); ok t_cmp($rc, 401, "topdir access denied"); }