geoff 2004/08/04 08:26:48
Modified: perl-framework/Apache-Test Changes
perl-framework/Apache-Test/lib/Apache TestConfig.pm
Log:
add @PHP_MODULE@ extra.conf.in substitution variable, which selects
mod_php4 or mod_php5 as appropriate
Revision Changes Path
1.154 +3 -0 httpd-test/perl-framework/Apache-Test/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- Changes 2 Aug 2004 19:00:02 -0000 1.153
+++ Changes 4 Aug 2004 15:26:48 -0000 1.154
@@ -8,6 +8,9 @@
=item 1.13-dev
+add @PHP_MODULE@ extra.conf.in substitution variable, which selects
+mod_php4 or mod_php5 as appropriate. [Geoffrey Young]
+
the have() function was removed entirely - use need() instead.
[Geoffrey Young]
1.229 +2 -1 httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- TestConfig.pm 15 Jul 2004 00:01:46 -0000 1.228
+++ TestConfig.pm 4 Aug 2004 15:26:48 -0000 1.229
@@ -83,7 +83,7 @@
sslcaorg => 'SSL CA organization to use for tests (default is asf)',
libmodperl => 'path to mod_perl\'s .so (full or relative to LIBEXECDIR)',
defines => 'values to add as -D defines (for example, "VAR1 VAR2")',
- (map { $_ . '_module_name', "$_ module name"} qw(cgi ssl thread access auth)),
+ (map { $_ . '_module_name', "$_ module name"} qw(cgi ssl thread access auth php)),
);
my %filepath_conf_opts = map { $_ => 1 }
@@ -306,6 +306,7 @@
$self->default_module(ssl => [qw(mod_ssl)]);
$self->default_module(access => [qw(mod_access mod_authz_host)]);
$self->default_module(auth => [qw(mod_auth mod_auth_basic)]);
+ $self->default_module(php => [qw(mod_php4 mod_php5)]);
$self->{hostport} = $self->hostport;