Fixed warning in Engine::CGI when PATH_INFO is undef

diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm
index 9f6698d..fae6a9a 100644 (file)
--- a/lib/Catalyst/Engine/CGI.pm
+++ b/lib/Catalyst/Engine/CGI.pm
@@ -137,7 +137,7 @@ sub prepare_path {
         $port = $c->request->secure ? 443 : 80;
     }
 
-    my $path = $base_path . $ENV{PATH_INFO};
+    my $path = $base_path . ( $ENV{PATH_INFO} || '' );
     $path =~ s{^/+}{};
 
     my $uri = URI->new;

diff --git a/t/conf/extra.conf.in b/t/conf/extra.conf.in
index fff041d..aaea739 100644 (file)
--- a/t/conf/extra.conf.in
+++ b/t/conf/extra.conf.in
@@ -16,4 +16,5 @@
     FastCgiIpcDir @ServerRoot@/tmp/tmp
     FastCgiServer @ServerRoot@/tmp/TestApp/script/testapp_fastcgi.pl -idle-timeout 300 -processes 1
     ScriptAlias /fastcgi/ @ServerRoot@/tmp/TestApp/script/testapp_fastcgi.pl/
+    Alias       /noslash  @ServerRoot@/tmp/TestApp/script/testapp_fastcgi.pl
 </IfModule>

diff --git a/t/optional_apache-fastcgi.pl b/t/optional_apache-fastcgi.pl
index 759febd..9f34939 100755 (executable)
--- a/t/optional_apache-fastcgi.pl
+++ b/t/optional_apache-fastcgi.pl
@@ -31,7 +31,7 @@ File::Copy::Recursive::dircopy( 't/lib', 't/tmp/TestApp/lib' );
 # remove TestApp's tests so Apache::Test doesn't try to run them
 rmtree 't/tmp/TestApp/t';
 
-$ENV{CATALYST_SERVER} = 'http://localhost:8529/fastcgi';
+$ENV{CATALYST_SERVER} = 'http://localhost:8529/noslash';
 
 Apache::TestRun->new->run(@ARGV);