Fix for non-root lighttpd

diff --git a/lib/Catalyst/Engine/FastCGI.pm b/lib/Catalyst/Engine/FastCGI.pm
index 9bc918e..8a28706 100644 (file)
--- a/lib/Catalyst/Engine/FastCGI.pm
+++ b/lib/Catalyst/Engine/FastCGI.pm
@@ -106,7 +106,7 @@ sub run {
         # http://lists.rawmode.org/pipermail/catalyst/2006-June/008361.html
         # Thanks to Mark Blythe for this fix
         if ( $env{SERVER_SOFTWARE} && $env{SERVER_SOFTWARE} =~ /lighttpd/ ) {
-            $env{PATH_INFO} = delete $env{SCRIPT_NAME};
+            $env{PATH_INFO} ||= delete $env{SCRIPT_NAME};
         }
         
         $class->handle_request( env => \%env );

diff --git a/t/optional_lighttpd-fastcgi-non-root.t b/t/optional_lighttpd-fastcgi-non-root.t
new file mode 100644 (file)
index 0000000..a28afe7
--- /dev/null
+++ b/t/optional_lighttpd-fastcgi-non-root.t
@@ -0,0 +1,114 @@
+#!perl
+
+use strict;
+use warnings;
+
+use File::Path;
+use File::Slurp qw(write_file);
+use FindBin;
+use IO::Socket;
+use Test::More;
+
+eval "use Catalyst::Devel 1.0";
+plan skip_all => 'Catalyst::Devel required' if $@;
+
+eval "use File::Copy::Recursive";
+plan skip_all => 'File::Copy::Recursive required' if $@;
+
+my $lighttpd_bin = $ENV{LIGHTTPD_BIN} || 'lighttpd';
+plan skip_all => 'Cannot find lighttpd, please set LIGHTTPD_BIN'
+    unless -x $lighttpd_bin;
+
+plan tests => 1;
+
+# clean up
+rmtree "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";
+
+# create a TestApp and copy the test libs into it
+mkdir "$FindBin::Bin/../t/tmp";
+chdir "$FindBin::Bin/../t/tmp";
+system "perl -I$FindBin::Bin/../lib $FindBin::Bin/../script/catalyst.pl TestApp";
+chdir "$FindBin::Bin/..";
+File::Copy::Recursive::dircopy( 't/lib', 't/tmp/TestApp/lib' );
+
+# remove TestApp's tests
+rmtree 't/tmp/TestApp/t';
+
+# Create a temporary lighttpd config
+my $docroot = "$FindBin::Bin/../t/tmp";
+my $port    = 8529;
+
+# Clean up docroot path
+$docroot =~ s{/t/..}{};
+
+my $conf = qq{
+# basic lighttpd config file for testing fcgi+catalyst
+server.modules = (
+    "mod_access",
+    "mod_fastcgi",
+    "mod_accesslog"
+)
+
+server.document-root = "$docroot"
+
+server.errorlog    = "$docroot/error.log"
+accesslog.filename = "$docroot/access.log"
+
+server.bind = "127.0.0.1"
+server.port = $port
+
+# catalyst app specific fcgi setup
+fastcgi.server = (
+    "/deep/path" => (
+        "FastCgiTest" => (
+            "socket"       => "$docroot/test.socket",
+            "check-local"  => "disable",
+            "bin-path"     => "$docroot/TestApp/script/testapp_fastcgi.pl",
+            "min-procs"    => 1,
+            "max-procs"    => 1,
+            "idle-timeout" => 20
+        )
+    )
+)
+};
+
+write_file "$docroot/lighttpd.conf", $conf;
+
+my $pid = open my $lighttpd, "$lighttpd_bin -D -f $docroot/lighttpd.conf 2>&1 |" 
+    or die "Unable to spawn lighttpd: $!";
+    
+# wait for it to start
+print "Waiting for server to start...\n";
+while ( check_port( 'localhost', $port ) != 1 ) {
+    sleep 1;
+}
+
+# run the testsuite against the server
+$ENV{CATALYST_SERVER} = "http://localhost:$port/deep/path";
+system( 'prove -r -Ilib/ t/live_*' );
+
+# shut it down
+kill 'INT', $pid;
+close $lighttpd;
+
+# clean up
+rmtree "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";
+
+ok( 'done' );
+
+sub check_port {
+    my ( $host, $port ) = @_;
+
+    my $remote = IO::Socket::INET->new(
+        Proto    => "tcp",
+        PeerAddr => $host,
+        PeerPort => $port
+    );
+    if ($remote) {
+        close $remote;
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
\ No newline at end of file