[Catalyst-commits] r10229 - Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine

[kmx at dev.catalyst.perl.org]

Author: kmx
Date: 2009-05-21 21:14:48 +0000 (Thu, 21 May 2009)
New Revision: 10229

Modified:
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/CGI.pm
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/FastCGI.pm
Log:
fix for ->engine->env in Catalyst::Engine::CGI & FastCGI (it should be complete now)

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/CGI.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/CGI.pm	2009-05-21 20:16:36 UTC (rev 10228)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/CGI.pm	2009-05-21 21:14:48 UTC (rev 10229)
@@ -233,7 +233,7 @@
 
 =cut
 
-sub run { shift; shift->handle_request(@_) }
+sub run { shift; shift->handle_request( env => \%ENV ) }
 
 =head1 SEE ALSO
 

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/FastCGI.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/FastCGI.pm	2009-05-21 20:16:36 UTC (rev 10228)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/FastCGI.pm	2009-05-21 21:14:48 UTC (rev 10229)
@@ -220,6 +220,12 @@
     my $self = shift;
     my $env = shift;
 
+    # we are gonna add variables from current system environment %ENV to %env 
+    # that contains at this moment just variables taken from FastCGI request
+    foreach my $k (keys(%ENV)) {
+      $env->{$k} = $ENV{$k} unless defined($env->{$k});
+    }
+
     return unless ( $env->{SERVER_SOFTWARE} );
 
     # If we're running under Lighttpd, swap PATH_INFO and SCRIPT_NAME