X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FController%2FWrapCGI.pm;h=a2897a52b9c8efae9495d88aa7bc748d191cd3e9;hb=49ad9853ee21e140d06393352ecb4f0d5cbc8410;hp=27da47d511476aaf61c010acfc5591cf8ae17ba2;hpb=d9280b8f48ca21a28645888ca9ffb311a7dbdc86;p=catagits%2FCatalyst-Controller-WrapCGI.git

diff --git a/lib/Catalyst/Controller/WrapCGI.pm b/lib/Catalyst/Controller/WrapCGI.pm
index 27da47d..a2897a5 100644
--- a/lib/Catalyst/Controller/WrapCGI.pm
+++ b/lib/Catalyst/Controller/WrapCGI.pm
@@ -9,7 +9,6 @@ extends 'Catalyst::Controller';
 use HTTP::Request::AsCGI ();
 use HTTP::Request ();
 use URI ();
-use Catalyst::Exception ();
 use URI::Escape;
 use HTTP::Request::Common;
 
@@ -19,13 +18,9 @@ use namespace::clean -except => 'meta';
 
 Catalyst::Controller::WrapCGI - Run CGIs in Catalyst
 
-=head1 VERSION
-
-Version 0.026
-
 =cut
 
-our $VERSION = '0.026';
+our $VERSION = '0.029';
 
 =head1 SYNOPSIS
 
@@ -197,8 +192,6 @@ sub wrap_cgi {
     }
   }
 
-  my $filtered_env = $self->_filtered_env(\%ENV);
-
   $req->content($body_content);
   $req->content_length(length($body_content));
 
@@ -217,7 +210,6 @@ sub wrap_cgi {
   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 +224,8 @@ sub wrap_cgi {
 
     my $saved_error;
 
+    local %ENV = %{ $self->_filtered_env(\%ENV) };
+
     $env->setup;
     eval { $call->() };
     $saved_error = $@;
@@ -239,9 +233,7 @@ sub wrap_cgi {
 
     select($old);
 
-    Catalyst::Exception->throw(
-        message => "CGI invocation failed: $saved_error"
-    ) if $saved_error;
+    die $saved_error if $saved_error;
   }
 
   return $env->response;