geoff 2004/04/02 21:42:24
Modified: t/response/TestModperl merge.pm
Log:
change <Directoryi /merge2> to <Location /merge2> so we don't need the real
merge2/ directory any longer
Revision Changes Path
1.5 +3 -6 modperl-2.0/t/response/TestModperl/merge.pm
Index: merge.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/merge.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- merge.pm 1 Apr 2004 18:53:12 -0000 1.4
+++ merge.pm 3 Apr 2004 05:42:23 -0000 1.5
@@ -160,8 +160,7 @@
PerlResponseHandler TestModperl::merge
</Location>
- AccessFileName htaccess
- <Directory @DocumentRoot@/merge2>
+ <Location /merge2>
# overrides "2" values - "1" and "3" values left untouched
PerlSetEnv MergeSetEnv2 SetEnv2Merge2Val
PerlSetVar MergeSetVar2 SetVar2Merge2Val
@@ -170,11 +169,9 @@
SetHandler perl-script
PerlResponseHandler TestModperl::merge
+ </Location>
- # don't trigger htaccess files automatically
- AllowOverride none
- </Directory>
-
+ AccessFileName htaccess
<Directory @DocumentRoot@/merge3>
# overrides "2" values
PerlSetEnv MergeSetEnv2 SetEnv2Merge3Val
