release 0.031

[catagits/Catalyst-Controller-WrapCGI.git] / lib / Catalyst / Controller / WrapCGI.pm

diff --git a/lib/Catalyst/Controller/WrapCGI.pm b/lib/Catalyst/Controller/WrapCGI.pm
index 5c6dfe7..5ad38e0 100644 (file)
--- a/lib/Catalyst/Controller/WrapCGI.pm
+++ b/lib/Catalyst/Controller/WrapCGI.pm
@@ -6,10 +6,10 @@ use mro 'c3';
 
 extends 'Catalyst::Controller';
 
+use Catalyst::Exception ();
 use HTTP::Request::AsCGI ();
 use HTTP::Request ();
 use URI ();
-use Catalyst::Exception ();
 use URI::Escape;
 use HTTP::Request::Common;
 
@@ -19,13 +19,9 @@ use namespace::clean -except => 'meta';
 
 Catalyst::Controller::WrapCGI - Run CGIs in Catalyst
 
-=head1 VERSION
-
-Version 0.023
-
 =cut
 
-our $VERSION = '0.023';
+our $VERSION = '0.031';
 
 =head1 SYNOPSIS
 
@@ -143,8 +139,6 @@ C<< $self->wrap_cgi($c, $coderef) >>
 Runs C<$coderef> in a CGI environment using L<HTTP::Request::AsCGI>, returns an
 L<HTTP::Response>.
 
-C<$coderef> is passed the Controller instance, and C<$c>.
-
 The CGI environment is set up based on C<$c>.
 
 The environment variables to pass on are taken from the configuration for your
@@ -199,8 +193,6 @@ sub wrap_cgi {
     }
   }
 
-  my $filtered_env = $self->_filtered_env(\%ENV);
-
   $req->content($body_content);
   $req->content_length(length($body_content));
 
@@ -219,7 +211,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,
@@ -234,16 +225,21 @@ sub wrap_cgi {
 
     my $saved_error;
 
+    local %ENV = %{ $self->_filtered_env(\%ENV) };
+
     $env->setup;
-    eval { $call->($self, $c) };
+    eval { $call->() };
     $saved_error = $@;
     $env->restore;
 
     select($old);
 
-    Catalyst::Exception->throw(
-        message => "CGI invocation failed: $saved_error"
-    ) if $saved_error;
+    if( $saved_error ) {
+        die $saved_error if ref $saved_error;
+        Catalyst::Exception->throw(
+            message => "CGI invocation failed: $saved_error"
+           );
+    }
   }
 
   return $env->response;
@@ -396,6 +392,8 @@ Rafael Kitover C<< <rkitover at cpan.org> >>
 
 Hans Dieter Pearcey C<< <hdp at cpan.org> >>
 
+Some code stolen from Tatsuhiko Miyagawa's L<CGI::Compile>.
+
 =head1 COPYRIGHT & LICENSE
 
 Copyright (c) 2008-2009 L<Catalyst::Controller::WrapCGI/AUTHOR> and