Fixed C::E::CGI to allow reuse of CGI.pm object

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 00fecbc..eee80b8 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -387,7 +387,7 @@ sub handler {
     return $status;
 }
 
-=item $c->prepare($r)
+=item $c->prepare($engine)
 
 Turns the engine-specific request( Apache, CGI ... )
 into a Catalyst context .

diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm
index 6d0fd12..e80c727 100644 (file)
--- a/lib/Catalyst/Engine/CGI.pm
+++ b/lib/Catalyst/Engine/CGI.pm
@@ -184,8 +184,8 @@ sub prepare_path {
 =cut
 
 sub prepare_request { 
-    my $c = shift;
-    $c->cgi( CGI->new );
+    my ( $c, $cgi ) = @_;
+    $c->cgi( $cgi || CGI->new );
     $c->cgi->_reset_globals;
 }