From: Greg Beaver <cellog@php.net>
Date: Wed, 30 Apr 2008 22:12:21 +0000 (+0000)
Subject: fix test (passes in PHP_5_3 on my 64-bit machine, have not yet tested in 5_2)
X-Git-Tag: RELEASE_2_0_0b1~131
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=791bb5db46b0783371e20606637441c0d084fd53;p=php

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 4b042fde68..db666970ef 100755
--- 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 87b9df3794..bdf8ee13c2 100644
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 b994561c91..ba84ac410a 100644
--- 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";