fix test (passes in PHP_5_3 on my 64-bit machine, have not yet tested in 5_2)

diff --git a/ext/phar/cgidebug b/ext/phar/cgidebug
index 4b042fde689799baca40b6939ac581e006afaa9c..db666970ef3ab69bfca19646b0859fc6c7c09676 100755 (executable)
--- a/ext/phar/cgidebug
+++ b/ext/phar/cgidebug
@@ -1,8 +1,8 @@
 #!/bin/sh
-export SCRIPT_NAME=/frontcontroller29.php
-export PATH_INFO=/fatalerror.phps
-export SCRIPT_FILENAME=/home/cellog/workspace/php5/ext/phar/tests/frontcontroller29.php
-export PATH_TRANSLATED=/home/cellog/workspace/php5/ext/phar/tests/frontcontroller29.php
+export SCRIPT_NAME=/frontcontroller34.php
+export PATH_INFO=/start/index.php
+export SCRIPT_FILENAME=/home/cellog/workspace/php5/ext/phar/tests/frontcontroller34.php
+export PATH_TRANSLATED=/home/cellog/workspace/php5/ext/phar/tests/frontcontroller34.php
 export REDIRECT_STATUS=1
 export REQUEST_METHOD=GET
 export REQUEST_URI=/frontcontroller29.php/fatalerror.phps

diff --git a/ext/phar/tests/files/frontcontroller19.phar b/ext/phar/tests/files/frontcontroller19.phar
index 87b9df3794493ee671d10c94ceeeed8490f3a27d..bdf8ee13c20c9bb6833bf8136aa3e13f75eaca08 100644 (file)
Binary files a/ext/phar/tests/files/frontcontroller19.phar and b/ext/phar/tests/files/frontcontroller19.phar differ

diff --git a/ext/phar/tests/files/frontcontroller19.phar.inc b/ext/phar/tests/files/frontcontroller19.phar.inc
index b994561c911d3c2aaea3e14000cb498076a4732d..ba84ac410a31fb34c615e7aff129fb526f46d152 100644 (file)
--- a/ext/phar/tests/files/frontcontroller19.phar.inc
+++ b/ext/phar/tests/files/frontcontroller19.phar.inc
@@ -7,7 +7,7 @@ include "./another.php";
 ';
 $a['start/another.php'] = '<?php
 echo "start/another.php\n";
-include "another.php";
+include "../another.php";
 ?>';
 $a['another.php'] = '<?php
 echo "another.php\n";