[Catalyst-commits] r9657 - in trunk/Catalyst-Controller-WrapCGI: . lib/Catalyst/Controller t t/lib/TestCGIBin/root/cgi-bin/path

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2009-04-03 23:00:51 +0100 (Fri, 03 Apr 2009)
New Revision: 9657

Modified:
   trunk/Catalyst-Controller-WrapCGI/Changes
   trunk/Catalyst-Controller-WrapCGI/Makefile.PL
   trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/CGIBin.pm
   trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/WrapCGI.pm
   trunk/Catalyst-Controller-WrapCGI/t/cgibin.t
   trunk/Catalyst-Controller-WrapCGI/t/env.t
   trunk/Catalyst-Controller-WrapCGI/t/lib/TestCGIBin/root/cgi-bin/path/test.pl
Log:
wrapcgi: releasing 0.0027 with kill_env from confound++

Modified: trunk/Catalyst-Controller-WrapCGI/Changes
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/Changes	2009-04-03 21:31:36 UTC (rev 9656)
+++ trunk/Catalyst-Controller-WrapCGI/Changes	2009-04-03 22:00:51 UTC (rev 9657)
@@ -20,5 +20,5 @@
     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.

Modified: trunk/Catalyst-Controller-WrapCGI/Makefile.PL
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/Makefile.PL	2009-04-03 21:31:36 UTC (rev 9656)
+++ trunk/Catalyst-Controller-WrapCGI/Makefile.PL	2009-04-03 22:00:51 UTC (rev 9657)
@@ -18,7 +18,7 @@
 
 test_requires 'Catalyst::Plugin::Static::Simple';
 
-build_requires 'Test::More';
+build_requires 'Test::More' => '0.86';
 
 auto_install;
 

Modified: trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/CGIBin.pm
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/CGIBin.pm	2009-04-03 21:31:36 UTC (rev 9656)
+++ trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/CGIBin.pm	2009-04-03 22:00:51 UTC (rev 9657)
@@ -22,11 +22,11 @@
 
 =head1 VERSION
 
-Version 0.004
+Version 0.005
 
 =cut
 
-our $VERSION = '0.004';
+our $VERSION = '0.005';
 
 =head1 SYNOPSIS
 
@@ -196,7 +196,6 @@
 
     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) . '}'

Modified: trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/WrapCGI.pm
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/WrapCGI.pm	2009-04-03 21:31:36 UTC (rev 9656)
+++ trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/WrapCGI.pm	2009-04-03 22:00:51 UTC (rev 9657)
@@ -15,11 +15,11 @@
 
 =head1 VERSION
 
-Version 0.0026
+Version 0.0027
 
 =cut
 
-our $VERSION = '0.0026';
+our $VERSION = '0.0027';
 
 =head1 SYNOPSIS
 

Modified: trunk/Catalyst-Controller-WrapCGI/t/cgibin.t
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/t/cgibin.t	2009-04-03 21:31:36 UTC (rev 9656)
+++ trunk/Catalyst-Controller-WrapCGI/t/cgibin.t	2009-04-03 22:00:51 UTC (rev 9657)
@@ -11,6 +11,9 @@
 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'

Modified: trunk/Catalyst-Controller-WrapCGI/t/env.t
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/t/env.t	2009-04-03 21:31:36 UTC (rev 9656)
+++ trunk/Catalyst-Controller-WrapCGI/t/env.t	2009-04-03 22:00:51 UTC (rev 9657)
@@ -6,6 +6,8 @@
 
 my $obj = Catalyst::Controller::WrapCGI->new;
 
+delete $ENV{MOD_PERL};
+
 my $want = {%ENV};
 my $have = {%ENV};
 {

Modified: trunk/Catalyst-Controller-WrapCGI/t/lib/TestCGIBin/root/cgi-bin/path/test.pl
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/t/lib/TestCGIBin/root/cgi-bin/path/test.pl	2009-04-03 21:31:36 UTC (rev 9656)
+++ trunk/Catalyst-Controller-WrapCGI/t/lib/TestCGIBin/root/cgi-bin/path/test.pl	2009-04-03 22:00:51 UTC (rev 9657)
@@ -5,5 +5,7 @@
 
 use CGI ':standard';
 
+die '$ENV{MOD_PERL} must not be set' if $ENV{MOD_PERL};
+
 print header;
 print 'foo:',param('foo'),' bar:',param('bar')