stas 2002/12/13 02:06:55
Modified: t/response/TestDirective perlloadmodule2.pm
perlloadmodule.pm
t/conf extra.last.conf.in
Log:
now that we control the configuration insertion order, these test's config
sections are moving back to their respective packages
Revision Changes Path
1.5 +15 -0 modperl-2.0/t/response/TestDirective/perlloadmodule2.pm
Index: perlloadmodule2.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule2.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perlloadmodule2.pm 12 Dec 2002 08:44:59 -0000 1.4
+++ perlloadmodule2.pm 13 Dec 2002 10:06:54 -0000 1.5
@@ -94,3 +94,18 @@
1;
__END__
+
+# APACHE_TEST_CONFIG_ORDER 950
+
+<Base>
+ PerlLoadModule TestDirective::perlloadmodule2
+
+ MyMergeTest one two
+</Base>
+<Location /TestDirective::perlloadmodule2>
+ MyMergeTest three four
+</Location>
+<Location /TestDirective::perlloadmodule2/subdir>
+ MyMergeTest five
+ MyMergeTest six
+</Location>
1.2 +12 -0 modperl-2.0/t/response/TestDirective/perlloadmodule.pm
Index: perlloadmodule.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perlloadmodule.pm 3 Dec 2002 15:38:22 -0000 1.1
+++ perlloadmodule.pm 13 Dec 2002 10:06:55 -0000 1.2
@@ -126,3 +126,15 @@
1;
__END__
+
+# APACHE_TEST_CONFIG_ORDER 950
+
+<Base>
+ PerlLoadModule TestDirective::perlloadmodule
+
+ MyTest one two
+ ServerTest per-server
+</Base>
+
+MyOtherTest value
+
1.4 +0 -21 modperl-2.0/t/conf/extra.last.conf.in
Index: extra.last.conf.in
===================================================================
RCS file: /home/cvs/modperl-2.0/t/conf/extra.last.conf.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- extra.last.conf.in 5 Dec 2002 03:31:09 -0000 1.3
+++ extra.last.conf.in 13 Dec 2002 10:06:55 -0000 1.4
@@ -1,26 +1,5 @@
PerlModule Apache::Module
-### --------------------------------- ###
-PerlLoadModule TestDirective::perlloadmodule
-
-MyTest one two
-ServerTest per-server
-
-<Location /TestDirective::perlloadmodule>
- MyOtherTest value
-</Location>
-
-### --------------------------------- ###
-PerlLoadModule TestDirective::perlloadmodule2
-
-MyMergeTest one two
-<Location /TestDirective::perlloadmodule2>
- MyMergeTest three four
-</Location>
-<Location /TestDirective::perlloadmodule2/subdir>
- MyMergeTest five
- MyMergeTest six
-</Location>
### --------------------------------- ###
<Perl >
