From 791bb5db46b0783371e20606637441c0d084fd53 Mon Sep 17 00:00:00 2001
From: Greg Beaver <cellog@php.net>
Date: Wed, 30 Apr 2008 22:12:21 +0000
Subject: [PATCH] fix test (passes in PHP_5_3 on my 64-bit machine, have not
 yet tested in 5_2)

---
 ext/phar/cgidebug                               |   8 ++++----
 ext/phar/tests/files/frontcontroller19.phar     | Bin 557 -> 560 bytes
 ext/phar/tests/files/frontcontroller19.phar.inc |   2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ext/phar/cgidebug b/ext/phar/cgidebug
index 4b042fde689..db666970ef3 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 87b9df3794493ee671d10c94ceeeed8490f3a27d..bdf8ee13c20c9bb6833bf8136aa3e13f75eaca08 100644
GIT binary patch
delta 79
zcmZ3>vVmoTI3ttd`^l1w>H>BQ3=E3zB|JcM4cCp&lLHu~L2|i_Wz2ed`ja0s>d92k
fS(7-;@K(L|%9$aaX*-|Ghn&)40;+d+@^u0LvuznI

delta 75
zcmdnMvX*6oI3rWZyUCJ_>H^jb3=AdjBs@TLz2lX4lLHu~L2|i_Ws{#V>d8cH{J$^z
biBAFdmSV9zKU4hERPSXo0oA%Y`8ojrxA_`B

diff --git a/ext/phar/tests/files/frontcontroller19.phar.inc b/ext/phar/tests/files/frontcontroller19.phar.inc
index b994561c911..ba84ac410a3 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";