Author: caelum
Date: 2010-02-19 04:37:17 +0000 (Fri, 19 Feb 2010)
New Revision: 12936
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/lib/CatalystX/GlobalContext.pm
trunk/Catalyst-Controller-WrapCGI/t/cgibin.t
Log:
fix fail with HTTP::Request::AsCGI 1.2 and Perl < 5.8.9, release
Modified: trunk/Catalyst-Controller-WrapCGI/Changes
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/Changes 2010-02-17 20:14:19 UTC (rev 12935)
+++ trunk/Catalyst-Controller-WrapCGI/Changes 2010-02-19 04:37:17 UTC (rev 12936)
@@ -1,5 +1,9 @@
Revision history for Catalyst-Controller-WrapCGI
+0.027 2010-02-19 04:34:50
+ - fix tests for Perl < 5.8.9
+ - fix for HTTP::Request::AsCGI 1.2
+
0.026 2010-01-03 11:37:15
- convert to CGI::Compile
- check exit status of non-Perl CGIs
Modified: trunk/Catalyst-Controller-WrapCGI/Makefile.PL
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/Makefile.PL 2010-02-17 20:14:19 UTC (rev 12935)
+++ trunk/Catalyst-Controller-WrapCGI/Makefile.PL 2010-02-19 04:37:17 UTC (rev 12936)
@@ -5,7 +5,7 @@
author 'Matt S. Trout <mst at shadowcat.co.uk>';
requires 'Catalyst' => '5.80015';
-requires 'HTTP::Request::AsCGI' => '0.8';;
+requires 'HTTP::Request::AsCGI' => '0.12';
requires 'CGI::Compile' => '0.07';
requires 'File::pushd';
requires 'File::Find::Rule';
Modified: trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/CGIBin.pm
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/CGIBin.pm 2010-02-17 20:14:19 UTC (rev 12935)
+++ trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/CGIBin.pm 2010-02-19 04:37:17 UTC (rev 12936)
@@ -24,11 +24,11 @@
=head1 VERSION
-Version 0.026
+Version 0.027
=cut
-our $VERSION = '0.026';
+our $VERSION = '0.027';
=head1 SYNOPSIS
Modified: trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/WrapCGI.pm
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/WrapCGI.pm 2010-02-17 20:14:19 UTC (rev 12935)
+++ trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/WrapCGI.pm 2010-02-19 04:37:17 UTC (rev 12936)
@@ -21,11 +21,11 @@
=head1 VERSION
-Version 0.026
+Version 0.027
=cut
-our $VERSION = '0.026';
+our $VERSION = '0.027';
=head1 SYNOPSIS
@@ -197,8 +197,6 @@
}
}
- my $filtered_env = $self->_filtered_env(\%ENV);
-
$req->content($body_content);
$req->content_length(length($body_content));
@@ -217,7 +215,6 @@
my $env = HTTP::Request::AsCGI->new(
$req,
($username ? (REMOTE_USER => $username) : ()),
- %$filtered_env,
PATH_INFO => $path_info,
# eww, this is likely broken:
FILEPATH_INFO => '/'.$c->action.$path_info,
@@ -232,6 +229,8 @@
my $saved_error;
+ local %ENV = %{ $self->_filtered_env(\%ENV) };
+
$env->setup;
eval { $call->() };
$saved_error = $@;
Modified: trunk/Catalyst-Controller-WrapCGI/lib/CatalystX/GlobalContext.pm
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/lib/CatalystX/GlobalContext.pm 2010-02-17 20:14:19 UTC (rev 12935)
+++ trunk/Catalyst-Controller-WrapCGI/lib/CatalystX/GlobalContext.pm 2010-02-19 04:37:17 UTC (rev 12936)
@@ -15,11 +15,11 @@
=head1 VERSION
-Version 0.026
+Version 0.027
=cut
-our $VERSION = '0.026';
+our $VERSION = '0.027';
=head1 SYNOPSIS
Modified: trunk/Catalyst-Controller-WrapCGI/t/cgibin.t
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/t/cgibin.t 2010-02-17 20:14:19 UTC (rev 12935)
+++ trunk/Catalyst-Controller-WrapCGI/t/cgibin.t 2010-02-19 04:37:17 UTC (rev 12936)
@@ -10,7 +10,12 @@
use HTTP::Request::Common;
my %orig_sig;
-BEGIN { %orig_sig = %SIG; }
+BEGIN {
+ %orig_sig = %SIG;
+# perl < 5.8.9 won't set a %SIG entry to undef, it sets it to ''
+ %orig_sig = map { defined $_ ? $_ : '' } %orig_sig
+ if $] < 5.008009;
+}
use Catalyst::Test 'TestCGIBin';
@@ -18,7 +23,6 @@
$ENV{MOD_PERL} = "mod_perl/2.0";
is_deeply \%SIG, \%orig_sig, '%SIG is preserved on compile';
-%SIG = %orig_sig;
my $response = request POST '/my-bin/path/test.pl', [
foo => 'bar',