Changeset 513

Timestamp:

08/08/2005 10:30:02 AM (3 years ago)

Author:

moo

Message:

pathinfo test

Location:

trunk/tests

Files:

• docroot/www/pathinfo.php (added)
• mod-fastcgi.t (modified) (4 diffs)

trunk/tests/mod-fastcgi.t

@@ -3 +3 @@
 use strict;
 use IO::Socket;
-use Test::More tests => 40;
+use Test::More tests => 41;
 
 my $basedir = (defined $ENV{'top_builddir'} ? $ENV{'top_builddir'} : '..');
@@ -18 +18 @@
 sub pidof {
         my $prog = $_[0];
-
-        open F, "ps ax  | grep $prog | grep -v grep | awk '{ print \$1 }'|" or
-        open F, "ps -ef | grep $prog | grep -v grep | awk '{ print \$2 }'|" or
+        my $pid;
+
+        open F, "ps ax  | grep $prog | grep -v grep | awk '{ print \$1 }'|" and $pid = <F> or
+        close F and
+        open F, "ps -ef | grep $prog | grep -v grep | awk '{ print \$2 }'|" and $pid = <F> or
           return -1;
 
-        my $pid = <F>;
         close F;
 
@@ -202 +203 @@
 
 SKIP: {
-        skip "no PHP running on port 1026", 24 if pidof("php") == -1; 
+        skip "no PHP running on port 1026", 25 if pidof("php") == -1; 
 
         ok(start_proc == 0, "Starting lighttpd") or die();
@@ -253 +254 @@
         @response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => '/phpself.php' } );
         ok(handle_http == 0, '$_SERVER["PHP_SELF"]');
+
+        @request  = ( <<EOF
+GET /pathinfo.php/foo HTTP/1.0
+Host: www.example.org
+EOF
+ );
+        @response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => '/foo' } );
+        ok(handle_http == 0, '$_SERVER["PATH_INFO"]');
 
         @request  = ( <<EOF