[Catalyst-commits] r8068 - trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2008-07-02 02:53:50 +0100 (Wed, 02 Jul 2008)
New Revision: 8068

Modified:
   trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/CGIBin.pm
   trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/WrapCGI.pm
Log:
Fix config parsing for WrapCGI


Modified: trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/CGIBin.pm
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/CGIBin.pm	2008-07-01 11:13:32 UTC (rev 8067)
+++ trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/CGIBin.pm	2008-07-02 01:53:50 UTC (rev 8068)
@@ -96,7 +96,7 @@
             undef $@;
         }
 
-        $app->log->info("Registering root/cgi_bin/$file as a $type CGI.")
+        $app->log->info("Registering root/cgi-bin/$file as a $type CGI.")
             if $app->debug;
 
         my $action_name = $self->cgi_action($file);

Modified: trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/WrapCGI.pm
===================================================================
--- trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/WrapCGI.pm	2008-07-01 11:13:32 UTC (rev 8067)
+++ trunk/Catalyst-Controller-WrapCGI/lib/Catalyst/Controller/WrapCGI.pm	2008-07-02 01:53:50 UTC (rev 8068)
@@ -146,7 +146,11 @@
 
   my @env;
 
-  for (@{ $self->{CGI}{pass_env} }) {
+  my $pass_env = $self->{CGI}{pass_env};
+  $pass_env = []            if not defined $pass_env;
+  $pass_env = [ $pass_env ] unless ref $pass_env;
+
+  for (@$pass_env) {
     if (m!^/(.*)/\z!) {
       my $re = qr/$1/;
       push @env, grep /$re/, keys %ENV;