wrapcgi: releasing 0.0027 with kill_env from confound++

diff --git a/Changes b/Changes
index afeebea..0037c6c 100644 (file)
--- a/Changes
+++ b/Changes
@@ -20,5 +20,5 @@ Revision history for Catalyst-Controller-WrapCGI
     Remove taint from tests as this breaks in a local::lib environment
     as PERL5LIB is stripped.
 
-0.0027
+0.0027  2009-04-03 14:55:34
     Add 'kill_env' and default to killing 'MOD_PERL' from environment.

diff --git a/Makefile.PL b/Makefile.PL
index d58d28f..09df012 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -18,7 +18,7 @@ requires 'namespace::clean';
 
 test_requires 'Catalyst::Plugin::Static::Simple';
 
-build_requires 'Test::More';
+build_requires 'Test::More' => '0.86';
 
 auto_install;
 

diff --git a/lib/Catalyst/Controller/CGIBin.pm b/lib/Catalyst/Controller/CGIBin.pm
index c911905..562cae5 100644 (file)
--- a/lib/Catalyst/Controller/CGIBin.pm
+++ b/lib/Catalyst/Controller/CGIBin.pm
@@ -22,11 +22,11 @@ Catalyst::Controller::CGIBin - Serve CGIs from root/cgi-bin
 
 =head1 VERSION
 
-Version 0.004
+Version 0.005
 
 =cut
 
-our $VERSION = '0.004';
+our $VERSION = '0.005';
 
 =head1 SYNOPSIS
 
@@ -196,7 +196,6 @@ sub wrap_perl_cgi {
 
     do {
         no warnings;
-# CGIs import stuff, so putting them into this package breaks Cat 5.8
         eval ' 
             package Catalyst::Controller::CGIBin::_CGIs_::'.$action_name.';
             sub {' . slurp($cgi) . '}'

diff --git a/lib/Catalyst/Controller/WrapCGI.pm b/lib/Catalyst/Controller/WrapCGI.pm
index aac4a43..d740721 100644 (file)
--- a/lib/Catalyst/Controller/WrapCGI.pm
+++ b/lib/Catalyst/Controller/WrapCGI.pm
@@ -15,11 +15,11 @@ Catalyst::Controller::WrapCGI - Run CGIs in Catalyst
 
 =head1 VERSION
 
-Version 0.0026
+Version 0.0027
 
 =cut
 
-our $VERSION = '0.0026';
+our $VERSION = '0.0027';
 
 =head1 SYNOPSIS
 

diff --git a/t/cgibin.t b/t/cgibin.t
index bdb4435..f8271fa 100644 (file)
--- a/t/cgibin.t
+++ b/t/cgibin.t
@@ -11,6 +11,9 @@ use Test::More tests => 4;
 use Catalyst::Test 'TestCGIBin';
 use HTTP::Request::Common;
 
+# this should be ignored
+$ENV{MOD_PERL} = "mod_perl/2.0";
+
 my $response = request POST '/cgi-bin/path/test.pl', [
     foo => 'bar',
     bar => 'baz'

diff --git a/t/env.t b/t/env.t
index 5453bed..7f41af1 100644 (file)
--- a/t/env.t
+++ b/t/env.t
@@ -6,6 +6,8 @@ use Catalyst::Controller::WrapCGI;
 
 my $obj = Catalyst::Controller::WrapCGI->new;
 
+delete $ENV{MOD_PERL};
+
 my $want = {%ENV};
 my $have = {%ENV};
 {

diff --git a/t/lib/TestCGIBin/root/cgi-bin/path/test.pl b/t/lib/TestCGIBin/root/cgi-bin/path/test.pl
index 5af6521..0486369 100755 (executable)
--- a/t/lib/TestCGIBin/root/cgi-bin/path/test.pl
+++ b/t/lib/TestCGIBin/root/cgi-bin/path/test.pl
@@ -5,5 +5,7 @@ use warnings;
 
 use CGI ':standard';
 
+die '$ENV{MOD_PERL} must not be set' if $ENV{MOD_PERL};
+
 print header;
 print 'foo:',param('foo'),' bar:',param('bar')