svn commit: r153133 - in perl/Apache-Test: Changes lib/Apache/TestConfigPerl.pm lib/Apache/TestRunPerl.pm

[ge...@apache.org]

Author: geoff
Date: Wed Feb  9 15:45:39 2005
New Revision: 153133

URL: http://svn.apache.org/viewcvs?view=rev&rev=153133
Log:
TestConfigPerl will now configure mod_perl last, giving mod_perl
highest priority throughout the httpd lifecycle.

additionally skip over loading Embperl.so, which seems to be the
historical reason for loading mod_perl before all other modules.
users wanting to test Embperl functionality can write their own
Apache::TestConfig subclass to handle Embperl and mod_perl ordering
issues.

Modified:
    perl/Apache-Test/Changes
    perl/Apache-Test/lib/Apache/TestConfigPerl.pm
    perl/Apache-Test/lib/Apache/TestRunPerl.pm

Modified: perl/Apache-Test/Changes
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/Changes?view=diff&r1=153132&r2=153133
==============================================================================
--- perl/Apache-Test/Changes (original)
+++ perl/Apache-Test/Changes Wed Feb  9 15:45:39 2005
@@ -8,12 +8,14 @@
 
 =item 1.21-dev
 
+TestConfigPerl will now configure mod_perl last, giving mod_perl
+highest priority throughout the httpd lifecycle.  [Geoffrey Young]
+
 Apache::TestConfig::untaint_path needs to remove empty entries in the
 PATH list, since -T considers those tainted too. [Stas]
 
 add Apache::TestHarnessPHP which allows for running client-side
 scripts via php instead of perl.  [Geoffrey Young]
-
 
 
 

Modified: perl/Apache-Test/lib/Apache/TestConfigPerl.pm
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/lib/Apache/TestConfigPerl.pm?view=diff&r1=153132&r2=153133
==============================================================================
--- perl/Apache-Test/lib/Apache/TestConfigPerl.pm (original)
+++ perl/Apache-Test/lib/Apache/TestConfigPerl.pm Wed Feb  9 15:45:39 2005
@@ -94,10 +94,7 @@
         debug $msg;
     }
 
-    # modules like Embperl.so need mod_perl.so to be loaded first,
-    # so make sure that it's loaded before files inherited from the
-    # global httpd.conf
-    $self->preamble_first(IfModule => '!mod_perl.c', $cfg);
+    $self->preamble(IfModule => '!mod_perl.c', $cfg);
 
 }
 

Modified: perl/Apache-Test/lib/Apache/TestRunPerl.pm
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/lib/Apache/TestRunPerl.pm?view=diff&r1=153132&r2=153133
==============================================================================
--- perl/Apache-Test/lib/Apache/TestRunPerl.pm (original)
+++ perl/Apache-Test/lib/Apache/TestRunPerl.pm Wed Feb  9 15:45:39 2005
@@ -35,6 +35,9 @@
 
     # Apache::TestConfigPerl already configures mod_perl.so
     Apache::TestConfig::autoconfig_skip_module_add('mod_perl.c');
+
+    # skip over Embperl.so - it's funky
+    Apache::TestConfig::autoconfig_skip_module_add('Embperl.c');
 }
 
 sub configure_modperl {