fix PATH_INFO munging, add to test case

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index d582f453b3b028a74593eddb65050c43fdb04657..85998092796b2af835335fee00f23401f38f3a26 100755 (executable)
--- 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 (file)
Binary files a/ext/phar/tests/files/frontcontroller8.phar and b/ext/phar/tests/files/frontcontroller8.phar differ

diff --git a/ext/phar/tests/files/frontcontroller8.phar.inc b/ext/phar/tests/files/frontcontroller8.phar.inc
index 70bd421d97451d3139fdfec4ad4ed2b9177d3827..b4ac8d3ffaeb2fb302963fdbf68a64a11928549a 100644 (file)
--- 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 0ac7bac4889d96104413cd7b38df675f22ea9498..4d0475b0788a705dde4f892b79ea311b21152c6b 100644 (file)
--- 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