Return-Path: 
 <modperl-cvs-return-5572-apmail-perl-modperl-cvs-archive=perl.apache.org@perl.apache.org>
Delivered-To: apmail-perl-modperl-cvs-archive@www.apache.org
Received: (qmail 9513 invoked from network); 17 May 2005 20:16:30 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 17 May 2005 20:16:30 -0000
Received: (qmail 57986 invoked by uid 500); 17 May 2005 17:27:35 -0000
Delivered-To: apmail-perl-modperl-cvs-archive@perl.apache.org
Received: (qmail 57889 invoked by uid 500); 17 May 2005 17:27:32 -0000
Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:modperl-cvs-help@perl.apache.org>
list-unsubscribe: <mailto:modperl-cvs-unsubscribe@perl.apache.org>
List-Post: <mailto:modperl-cvs@perl.apache.org>
Reply-To: dev@perl.apache.org
List-Id: <modperl-cvs.perl.apache.org>
Delivered-To: mailing list modperl-cvs@perl.apache.org
Received: (qmail 57811 invoked by uid 99); 17 May 2005 17:27:29 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Tue, 17 May 2005 10:27:29 -0700
Received: (qmail 25641 invoked by uid 65534); 17 May 2005 17:27:14 -0000
Message-ID: <20050517172714.25640.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r170620 - in /perl/modperl/trunk/t: modperl/setupenv.t
 response/TestModperl/setupenv.pm
Date: Tue, 17 May 2005 17:27:13 -0000
To: modperl-cvs@perl.apache.org
From: stas@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: stas
Date: Tue May 17 10:27:10 2005
New Revision: 170620

URL: http://svn.apache.org/viewcvs?rev=3D170620&view=3Drev
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=3D170620&r1=3D170619&r2=3D170620&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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 =3D> 63, 0;
 }
=20

Modified: perl/modperl/trunk/t/response/TestModperl/setupenv.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModper=
l/setupenv.pm?rev=3D170620&r1=3D170619&r2=3D170620&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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
=20
     # SetEnv is affected by +SetupEnv
-    SetEnv SRV_SETENV server
+    <IfModule mod_env.c>
+        SetEnv SRV_SETENV server
+    </IfModule>
=20
     # 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
=20
         PerlFixupHandler TestModperl::setupenv::subenv_two
-
-        SetEnv DIR_SETENV mpdefault
+        <IfModule mod_env.c>
+            SetEnv DIR_SETENV mpdefault
+        </IfModule>
         PerlSetEnv DIR_PERLSETENV mpdefault
     </Location>
=20
@@ -226,7 +229,9 @@
=20
         PerlFixupHandler TestModperl::setupenv::subenv_two
=20
-        SetEnv DIR_SETENV mpsetup
+        <IfModule mod_env.c>
+            SetEnv DIR_SETENV mpsetup
+        </IfModule>
         PerlSetEnv DIR_PERLSETENV mpsetup
     </Location>
=20
@@ -242,7 +247,9 @@
         PerlHeaderParserHandler TestModperl::setupenv::subenv_void
         PerlFixupHandler TestModperl::setupenv::subenv_two
=20
-        SetEnv DIR_SETENV mpvoid
+        <IfModule mod_env.c>
+            SetEnv DIR_SETENV mpvoid
+        </IfModule>
         PerlSetEnv DIR_PERLSETENV mpvoid
     </Location>
=20
@@ -260,7 +267,9 @@
         PerlHeaderParserHandler TestModperl::setupenv::subenv_void
         PerlFixupHandler TestModperl::setupenv::subenv_two
=20
-        SetEnv DIR_SETENV mpsetupvoid
+        <IfModule mod_env.c>
+            SetEnv DIR_SETENV mpsetupvoid
+        </IfModule>
         PerlSetEnv DIR_PERLSETENV mpsetupvoid
     </Location>
=20
@@ -272,7 +281,9 @@
=20
         PerlFixupHandler TestModperl::setupenv::subenv_two
=20
-        SetEnv DIR_SETENV psdefault
+        <IfModule mod_env.c>
+            SetEnv DIR_SETENV psdefault
+        </IfModule>
         PerlSetEnv DIR_PERLSETENV psdefault
     </Location>
=20
@@ -286,7 +297,9 @@
=20
         PerlFixupHandler TestModperl::setupenv::subenv_two
=20
-        SetEnv DIR_SETENV psnosetup
+        <IfModule mod_env.c>
+            SetEnv DIR_SETENV psnosetup
+        </IfModule>
         PerlSetEnv DIR_PERLSETENV psnosetup
     </Location>
=20
@@ -302,7 +315,9 @@
         PerlHeaderParserHandler TestModperl::setupenv::subenv_void
         PerlFixupHandler TestModperl::setupenv::subenv_two
=20
-        SetEnv DIR_SETENV psvoid
+        <IfModule mod_env.c>
+            SetEnv DIR_SETENV psvoid
+        </IfModule>
         PerlSetEnv DIR_PERLSETENV psvoid
     </Location>
=20
@@ -318,7 +333,9 @@
         PerlHeaderParserHandler TestModperl::setupenv::subenv_void
         PerlFixupHandler TestModperl::setupenv::subenv_two
=20
-        SetEnv DIR_SETENV psnosetupvoid
+        <IfModule mod_env.c>
+            SetEnv DIR_SETENV psnosetupvoid
+        </IfModule>
         PerlSetEnv DIR_PERLSETENV psnosetupvoid
     </Location>
 </VirtualHost>