Author: stas
Date: Tue May 17 10:27:10 2005
New Revision: 170620
URL: http://svn.apache.org/viewcvs?rev=170620&view=rev
Log:
SetEnv requires mod_env
Modified:
perl/modperl/trunk/t/modperl/setupenv.t
perl/modperl/trunk/t/response/TestModperl/setupenv.pm
Modified: perl/modperl/trunk/t/modperl/setupenv.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/modperl/setupenv.t?rev=170620&r1=170619&r2=170620&view=diff
==============================================================================
--- perl/modperl/trunk/t/modperl/setupenv.t (original)
+++ perl/modperl/trunk/t/modperl/setupenv.t Tue May 17 10:27:10 2005
@@ -26,7 +26,7 @@
# this requires keepalives and a per-connection interpreter
# to make certain we can plan in one request and test in another
# which requires LWP
-unless (need_lwp()) {
+unless (need_lwp() && need_module('mod_env')) {
plan tests => 63, 0;
}
Modified: perl/modperl/trunk/t/response/TestModperl/setupenv.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModperl/setupenv.pm?rev=170620&r1=170619&r2=170620&view=diff
==============================================================================
--- perl/modperl/trunk/t/response/TestModperl/setupenv.pm (original)
+++ perl/modperl/trunk/t/response/TestModperl/setupenv.pm Tue May 17 10:27:10
2005
@@ -190,7 +190,9 @@
PerlPostReadRequestHandler TestModperl::setupenv::subenv_one
# SetEnv is affected by +SetupEnv
- SetEnv SRV_SETENV server
+ <IfModule mod_env.c>
+ SetEnv SRV_SETENV server
+ </IfModule>
# PerlSetEnv is not affected by +SetupEnv or -SetupEnv
# it is entirely separate and always set if configured
@@ -210,8 +212,9 @@
PerlResponseHandler TestModperl::setupenv::noenv
PerlFixupHandler TestModperl::setupenv::subenv_two
-
- SetEnv DIR_SETENV mpdefault
+ <IfModule mod_env.c>
+ SetEnv DIR_SETENV mpdefault
+ </IfModule>
PerlSetEnv DIR_PERLSETENV mpdefault
</Location>
@@ -226,7 +229,9 @@
PerlFixupHandler TestModperl::setupenv::subenv_two
- SetEnv DIR_SETENV mpsetup
+ <IfModule mod_env.c>
+ SetEnv DIR_SETENV mpsetup
+ </IfModule>
PerlSetEnv DIR_PERLSETENV mpsetup
</Location>
@@ -242,7 +247,9 @@
PerlHeaderParserHandler TestModperl::setupenv::subenv_void
PerlFixupHandler TestModperl::setupenv::subenv_two
- SetEnv DIR_SETENV mpvoid
+ <IfModule mod_env.c>
+ SetEnv DIR_SETENV mpvoid
+ </IfModule>
PerlSetEnv DIR_PERLSETENV mpvoid
</Location>
@@ -260,7 +267,9 @@
PerlHeaderParserHandler TestModperl::setupenv::subenv_void
PerlFixupHandler TestModperl::setupenv::subenv_two
- SetEnv DIR_SETENV mpsetupvoid
+ <IfModule mod_env.c>
+ SetEnv DIR_SETENV mpsetupvoid
+ </IfModule>
PerlSetEnv DIR_PERLSETENV mpsetupvoid
</Location>
@@ -272,7 +281,9 @@
PerlFixupHandler TestModperl::setupenv::subenv_two
- SetEnv DIR_SETENV psdefault
+ <IfModule mod_env.c>
+ SetEnv DIR_SETENV psdefault
+ </IfModule>
PerlSetEnv DIR_PERLSETENV psdefault
</Location>
@@ -286,7 +297,9 @@
PerlFixupHandler TestModperl::setupenv::subenv_two
- SetEnv DIR_SETENV psnosetup
+ <IfModule mod_env.c>
+ SetEnv DIR_SETENV psnosetup
+ </IfModule>
PerlSetEnv DIR_PERLSETENV psnosetup
</Location>
@@ -302,7 +315,9 @@
PerlHeaderParserHandler TestModperl::setupenv::subenv_void
PerlFixupHandler TestModperl::setupenv::subenv_two
- SetEnv DIR_SETENV psvoid
+ <IfModule mod_env.c>
+ SetEnv DIR_SETENV psvoid
+ </IfModule>
PerlSetEnv DIR_PERLSETENV psvoid
</Location>
@@ -318,7 +333,9 @@
PerlHeaderParserHandler TestModperl::setupenv::subenv_void
PerlFixupHandler TestModperl::setupenv::subenv_two
- SetEnv DIR_SETENV psnosetupvoid
+ <IfModule mod_env.c>
+ SetEnv DIR_SETENV psnosetupvoid
+ </IfModule>
PerlSetEnv DIR_PERLSETENV psnosetupvoid
</Location>
</VirtualHost>
