From cb8f158cd5fe7769ced391c7d3b49b3c0baaedc4 Mon Sep 17 00:00:00 2001
From: Greg Beaver <cellog@php.net>
Date: Tue, 22 Apr 2008 17:11:30 +0000
Subject: [PATCH] fix PATH_INFO munging, add to test case

---
 ext/phar/phar_object.c                         |   2 +-
 ext/phar/tests/files/frontcontroller8.phar     | Bin 649 -> 672 bytes
 ext/phar/tests/files/frontcontroller8.phar.inc |   2 +-
 ext/phar/tests/frontcontroller25.phpt          |   3 ++-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index d582f453b3..8599809279 100755
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -91,7 +91,7 @@ static void phar_mung_server_vars(char *fname, char *entry, int entry_len, char
 		path_info = Z_STRVAL_PP(stuff);
 		code = Z_STRLEN_PP(stuff);
 		if (Z_STRLEN_PP(stuff) > entry_len && !memcmp(Z_STRVAL_PP(stuff), entry, entry_len)) {
-			ZVAL_STRINGL(*stuff, Z_STRVAL_PP(stuff) + entry_len, Z_STRLEN_PP(stuff) - entry_len - request_uri_len, 1);
+			ZVAL_STRINGL(*stuff, Z_STRVAL_PP(stuff) + entry_len, request_uri_len, 1);
 
 			MAKE_STD_ZVAL(temp); 
 			ZVAL_STRINGL(temp, path_info, code, 0);
diff --git a/ext/phar/tests/files/frontcontroller8.phar b/ext/phar/tests/files/frontcontroller8.phar
index 17648c208be08ddc435c6d84874761e29497d2cb..9061ec74fe9e772a053dbf704954fc9ef024f4f0 100644
GIT binary patch
delta 146
zcmeBVUBEiwJyW>M#E-J-_6!UR;WB(4Ao}|9Ci88KKn4)70&${VRzW%okP$93*_2Tp
zsAF;%qbi81WmE)F3m}3AA%ZU$ZA5hxRN{kOgTh>cqLl(1Lp<U={oMQ~D=~S?9DQ*A
d=lRd)9DdviRyg=|s=$(*d$LSGv)!G1odBf1Duw_6

delta 124
zcmZ3$+Q~ZMJyWja#E-J-8Vn2!xsrSyAiDXAzt1*CAOi?kfjChwt00{P$jFtPY|1DP
z)G;}XQ58hhGAe?o1rWi55WyFWHj}NHJY|k>r>cG1ljF(%f9a~bEi*22>MZhS0-ECP
H<m&_ggP|en

diff --git a/ext/phar/tests/files/frontcontroller8.phar.inc b/ext/phar/tests/files/frontcontroller8.phar.inc
index 70bd421d97..b4ac8d3ffa 100644
--- a/ext/phar/tests/files/frontcontroller8.phar.inc
+++ b/ext/phar/tests/files/frontcontroller8.phar.inc
@@ -2,7 +2,7 @@
 @unlink(dirname(__FILE__) . '/frontcontroller8.phar');
 $a = new Phar(dirname(__FILE__) . '/frontcontroller8.phar');
 $a['a.phps'] = 'hio1';
-$a['a1.phps'] = '<?php var_dump($_SERVER["REQUEST_URI"]);';
+$a['a1.phps'] = '<?php var_dump($_SERVER["REQUEST_URI"], $_SERVER["PATH_INFO"]);';
 $a['a.jpg'] = 'hio2';
 $a['a.php'] = '<?php function hio(){}';
 $a['fronk.gronk'] = 'hio3';
diff --git a/ext/phar/tests/frontcontroller25.phpt b/ext/phar/tests/frontcontroller25.phpt
index 0ac7bac488..4d0475b078 100644
--- a/ext/phar/tests/frontcontroller25.phpt
+++ b/ext/phar/tests/frontcontroller25.phpt
@@ -11,4 +11,5 @@ files/frontcontroller8.phar
 --EXPECTHEADERS--
 Content-type: text/html
 --EXPECTF--
-string(42) "/frontcontroller25.php/a1.phps/extra/stuff"
\ No newline at end of file
+string(42) "/frontcontroller25.php/a1.phps/extra/stuff"
+string(12) "/extra/stuff"
\ No newline at end of file
-- 
2.50.1