Fixed FastCGI engine to not clobber the global %ENV on each request (Sam Vilain)

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Engine / CGI.pm

diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm
index 847209f..741816e 100644 (file)
--- a/lib/Catalyst/Engine/CGI.pm
+++ b/lib/Catalyst/Engine/CGI.pm
@@ -4,7 +4,8 @@ use strict;
 use base 'Catalyst::Engine';
 use NEXT;
 use URI;
-use URI::Query;
+
+__PACKAGE__->mk_accessors( 'env' );
 
 =head1 NAME
 
@@ -54,6 +55,7 @@ sub finalize_headers {
 
 sub prepare_connection {
     my ( $self, $c ) = @_;
+    local(*ENV) = $self->env || \%ENV;
 
     $c->request->address( $ENV{REMOTE_ADDR} );
 
@@ -91,6 +93,7 @@ sub prepare_connection {
 
 sub prepare_headers {
     my ( $self, $c ) = @_;
+    local(*ENV) = $self->env || \%ENV;
 
     # Read headers from %ENV
     while ( my ( $header, $value ) = each %ENV ) {
@@ -106,6 +109,7 @@ sub prepare_headers {
 
 sub prepare_path {
     my ( $self, $c ) = @_;
+    local(*ENV) = $self->env || \%ENV;
 
     my $scheme = $c->request->secure ? 'https' : 'http';
     my $host      = $ENV{HTTP_HOST}   || $ENV{SERVER_NAME};
@@ -156,9 +160,23 @@ sub prepare_path {
 
 sub prepare_query_parameters {
     my ( $self, $c ) = @_;
+    local(*ENV) = $self->env || \%ENV;
+    
+    if ( $ENV{QUERY_STRING} ) {
+        $self->SUPER::prepare_query_parameters( $c, $ENV{QUERY_STRING} );
+    }
+}
+
+=item $self->prepare_request($c, (env => \%env))
 
-    my $u = URI::Query->new( $ENV{QUERY_STRING} );
-    $c->request->query_parameters( { $u->hash } );
+=cut
+
+sub prepare_request {
+    my ( $self, $c, %args ) = @_;
+
+    if ( $args{env} ) {
+       $self->env( $args{env} );
+    }
 }
 
 =item $self->prepare_write($c)