fix webPhar() in CGI sapi, update tests to reflect reality of how these ENV vars are passed

62 files changed, 161 insertions, 66 deletions

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index ed31877f65..434e7d9812 100755
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -367,7 +367,7 @@ PHP_METHOD(Phar, webPhar)
 	phar_mime_type mime;
 	zval *mimeoverride = NULL, *rewrites = NULL;
 	char *alias = NULL, *error, *plain_map, *index_php, *f404 = NULL;
-	int alias_len = 0, ret, f404_len = 0;
+	int alias_len = 0, ret, f404_len = 0, free_pathinfo = 0;
 	char *fname, *basename, *path_info, *mime_type, *entry, *pt;
 	int fname_len, entry_len, code, index_php_len = 0;
 	phar_entry_data *phar;
@@ -416,7 +416,30 @@ PHP_METHOD(Phar, webPhar)
 		basename++;
 	}
 
-	path_info = SG(request_info).request_uri;
+	if (strlen(sapi_module.name) == sizeof("cgi-fcgi")-1 && !strncmp(sapi_module.name, "cgi-fcgi", sizeof("cgi-fcgi")-1)) {
+		char *testit;
+
+		testit = sapi_getenv("SCRIPT_NAME", sizeof("SCRIPT_NAME")-1 TSRMLS_CC);
+		if (!(pt = strstr(testit, basename))) {
+			return;
+		}
+		path_info = sapi_getenv("PATH_INFO", sizeof("PATH_INFO")-1 TSRMLS_CC);
+		if (path_info) {
+			entry = estrdup(path_info);
+			entry_len = strlen(entry);
+			spprintf(&path_info, 0, "%s%s", testit, path_info);
+			free_pathinfo = 1;
+		} else {
+			path_info = testit;
+			entry = estrndup("", 0);
+			entry_len = 0;
+		}
+		pt = estrndup(testit, (pt - testit) + (fname_len - (basename - fname)));
+		goto skip_entry_dupe;
+	} else {
+		path_info = SG(request_info).request_uri;
+	}
+
 	if (!(pt = strstr(path_info, basename))) {
 		/* this can happen with rewrite rules - and we have no idea what to do then, so return */
 		return;
@@ -427,6 +450,8 @@ PHP_METHOD(Phar, webPhar)
 	entry = estrndup(pt + (fname_len - (basename - fname)), entry_len);
 
 	pt = estrndup(path_info, (pt - path_info) + (fname_len - (basename - fname)));
+
+skip_entry_dupe:
 	if (!entry_len || (entry_len == 1 && entry[0] == '/')) {
 		efree(entry);
 		/* direct request */
@@ -447,6 +472,9 @@ PHP_METHOD(Phar, webPhar)
 				efree(error);
 			}
 			phar_do_404(fname, fname_len, f404, f404_len, entry, entry_len TSRMLS_CC);
+			if (free_pathinfo) {
+				efree(path_info);
+			}
 			zend_bailout();
 			return;
 		} else {
@@ -467,6 +495,9 @@ PHP_METHOD(Phar, webPhar)
 				ctr.line_len = spprintf(&(ctr.line), 4096, "Location: %s%s", path_info, entry);
 			}
 			*tmp = sa;
+			if (free_pathinfo) {
+				efree(path_info);
+			}
 			sapi_header_op(SAPI_HEADER_REPLACE, &ctr TSRMLS_CC);
 			sapi_send_headers(TSRMLS_C);
 			phar_entry_delref(phar TSRMLS_CC);
diff --git a/ext/phar/tests/frontcontroller1.phpt b/ext/phar/tests/frontcontroller1.phpt
index 296acfc8cf..b925c637ea 100644
--- a/ext/phar/tests/frontcontroller1.phpt
+++ b/ext/phar/tests/frontcontroller1.phpt
@@ -3,8 +3,9 @@ Phar front controller other
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller1.php/a.jpg
+SCRIPT_NAME=/frontcontroller1.php
 REQUEST_URI=/frontcontroller1.php/a.jpg
+PATH_INFO=/a.jpg
 --FILE_EXTERNAL--
 frontcontroller.phar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/frontcontroller10.phpt b/ext/phar/tests/frontcontroller10.phpt
index a0c53afb73..a96ffe1159 100644
--- a/ext/phar/tests/frontcontroller10.phpt
+++ b/ext/phar/tests/frontcontroller10.phpt
@@ -3,8 +3,9 @@ Phar front controller rewrite array invalid
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller10.php/hi
+SCRIPT_NAME=/frontcontroller10.php
 REQUEST_URI=/frontcontroller10.php/hi
+PATH_INFO=/hi
 --FILE_EXTERNAL--
 frontcontroller4.phar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/frontcontroller11.phpt b/ext/phar/tests/frontcontroller11.phpt
index 3da89977cb..d1e8893eb3 100644
--- a/ext/phar/tests/frontcontroller11.phpt
+++ b/ext/phar/tests/frontcontroller11.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type extension is not a string
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller11.php/a.php
+SCRIPT_NAME=/frontcontroller11.php
 REQUEST_URI=/frontcontroller11.php/a.php
+PATH_INFO=/a.php
 --FILE_EXTERNAL--
 frontcontroller5.phar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/frontcontroller12.phpt b/ext/phar/tests/frontcontroller12.phpt
index 8054fa53a3..0eb0ef7e1f 100644
--- a/ext/phar/tests/frontcontroller12.phpt
+++ b/ext/phar/tests/frontcontroller12.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type unknown int
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller12.php/a.php
+SCRIPT_NAME=/frontcontroller12.php
 REQUEST_URI=/frontcontroller12.php/a.php
+PATH_INFO=/a.php
 --FILE_EXTERNAL--
 frontcontroller6.phar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/frontcontroller13.phpt b/ext/phar/tests/frontcontroller13.phpt
index eb3c01ff9a..07ec55b0c7 100644
--- a/ext/phar/tests/frontcontroller13.phpt
+++ b/ext/phar/tests/frontcontroller13.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type not string/int
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller13.php/a.php
+SCRIPT_NAME=/frontcontroller13.php
 REQUEST_URI=/frontcontroller13.php/a.php
+PATH_INFO=/a.php
 --FILE_EXTERNAL--
 frontcontroller7.phar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/frontcontroller14.phpt b/ext/phar/tests/frontcontroller14.phpt
index 0a7e61aff0..508efc8cd0 100644
--- a/ext/phar/tests/frontcontroller14.phpt
+++ b/ext/phar/tests/frontcontroller14.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type override, other
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller14.php/a.jpg
+SCRIPT_NAME=/frontcontroller14.php
 REQUEST_URI=/frontcontroller14.php/a.jpg
+PATH_INFO=/a.jpg
 --FILE_EXTERNAL--
 frontcontroller8.phar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/frontcontroller15.phpt b/ext/phar/tests/frontcontroller15.phpt
index 21fb069231..fb75199ec4 100644
--- a/ext/phar/tests/frontcontroller15.phpt
+++ b/ext/phar/tests/frontcontroller15.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type override, Phar::PHPS
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller15.php/a.php
+SCRIPT_NAME=/frontcontroller15.php
 REQUEST_URI=/frontcontroller15.php/a.php
+PATH_INFO=/a.php
 --FILE_EXTERNAL--
 frontcontroller8.phar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/frontcontroller16.phpt b/ext/phar/tests/frontcontroller16.phpt
index e68a0c0e39..81210ac2eb 100644
--- a/ext/phar/tests/frontcontroller16.phpt
+++ b/ext/phar/tests/frontcontroller16.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type override, Phar::PHP
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller16.php/a.phps
+SCRIPT_NAME=/frontcontroller16.php
 REQUEST_URI=/frontcontroller16.php/a.phps
+PATH_INFO=/a.phps
 --FILE_EXTERNAL--
 frontcontroller8.phar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/frontcontroller17.phpt b/ext/phar/tests/frontcontroller17.phpt
index 3aea1262de..e89c9e08e3 100644
--- a/ext/phar/tests/frontcontroller17.phpt
+++ b/ext/phar/tests/frontcontroller17.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type unknown
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller17.php/fronk.gronk
+SCRIPT_NAME=/frontcontroller17.php
 REQUEST_URI=/frontcontroller17.php/fronk.gronk
+PATH_INFO=/fronk.gronk
 --FILE_EXTERNAL--
 frontcontroller8.phar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/frontcontroller18.phpt b/ext/phar/tests/frontcontroller18.phpt
index e2ae111d9b..4c50afb5fc 100644
--- a/ext/phar/tests/frontcontroller18.phpt
+++ b/ext/phar/tests/frontcontroller18.phpt
@@ -3,8 +3,9 @@ Phar front controller $_SERVER munging failure
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller18.php/fronk.gronk
+SCRIPT_NAME=/frontcontroller18.php
 REQUEST_URI=/frontcontroller18.php/fronk.gronk
+PATH_INFO=/fronk.gronk
 --FILE_EXTERNAL--
 frontcontroller9.phar
 --EXPECTF--
diff --git a/ext/phar/tests/frontcontroller19.phpt b/ext/phar/tests/frontcontroller19.phpt
index b5b9a23a64..d01cf1e31e 100644
--- a/ext/phar/tests/frontcontroller19.phpt
+++ b/ext/phar/tests/frontcontroller19.phpt
@@ -3,8 +3,9 @@ Phar front controller $_SERVER munging failure 2
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller19.php/
+SCRIPT_NAME=/frontcontroller19.php
 REQUEST_URI=/frontcontroller19.php/
+PATH_INFO=/
 --FILE_EXTERNAL--
 frontcontroller10.phar
 --EXPECTF--
diff --git a/ext/phar/tests/frontcontroller2.phpt b/ext/phar/tests/frontcontroller2.phpt
index 69573f95d3..aed4afff42 100644
--- a/ext/phar/tests/frontcontroller2.phpt
+++ b/ext/phar/tests/frontcontroller2.phpt
@@ -3,8 +3,9 @@ Phar front controller PHP test
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller2.php/a.php
+SCRIPT_NAME=/frontcontroller2.php
 REQUEST_URI=/frontcontroller2.php/a.php
+PATH_INFO=/a.php
 --FILE_EXTERNAL--
 frontcontroller.phar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/frontcontroller20.phpt b/ext/phar/tests/frontcontroller20.phpt
index dd07356da5..d55d8a14e1 100644
--- a/ext/phar/tests/frontcontroller20.phpt
+++ b/ext/phar/tests/frontcontroller20.phpt
@@ -3,8 +3,9 @@ Phar front controller $_SERVER munging failure 3
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller20.php/
+SCRIPT_NAME=/frontcontroller20.php
 REQUEST_URI=/frontcontroller20.php/
+PATH_INFO=/
 --FILE_EXTERNAL--
 frontcontroller11.phar
 --EXPECTF--
diff --git a/ext/phar/tests/frontcontroller21.phpt b/ext/phar/tests/frontcontroller21.phpt
index b9bb6df92c..8523209142 100644
--- a/ext/phar/tests/frontcontroller21.phpt
+++ b/ext/phar/tests/frontcontroller21.phpt
@@ -3,8 +3,10 @@ Phar front controller $_SERVER munging success
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller21.php/index.php
+SCRIPT_NAME=/frontcontroller21.php
 REQUEST_URI=/frontcontroller21.php/index.php?test=hi
+PATH_INFO=/index.php
+QUERY_STRING=test=hi
 --FILE_EXTERNAL--
 frontcontroller12.phar
 --EXPECTHEADERS--
@@ -15,6 +17,6 @@ string(%d) "phar://%sfrontcontroller21.php/index.php"
 string(%d) "phar://%sfrontcontroller21.php/index.php"
 string(18) "/index.php?test=hi"
 string(32) "/frontcontroller21.php/index.php"
-string(32) "/frontcontroller21.php/index.php"
+string(22) "/frontcontroller21.php"
 string(%d) "%sfrontcontroller21.php"
 string(40) "/frontcontroller21.php/index.php?test=hi"
\ No newline at end of file
diff --git a/ext/phar/tests/frontcontroller22.phpt b/ext/phar/tests/frontcontroller22.phpt
index 8053b61bf2..c69b7f5037 100644
--- a/ext/phar/tests/frontcontroller22.phpt
+++ b/ext/phar/tests/frontcontroller22.phpt
@@ -3,8 +3,9 @@ Phar front controller include from cwd test 1
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller22.php/index.php
+SCRIPT_NAME=/frontcontroller22.php
 REQUEST_URI=/frontcontroller22.php/index.php
+PATH_INFO=/index.php
 --FILE_EXTERNAL--
 frontcontroller13.phar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/frontcontroller3.phpt b/ext/phar/tests/frontcontroller3.phpt
index 932dd0d8c0..c85bfc635f 100644
--- a/ext/phar/tests/frontcontroller3.phpt
+++ b/ext/phar/tests/frontcontroller3.phpt
@@ -3,8 +3,9 @@ Phar front controller phps
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller3.php/a.phps
+SCRIPT_NAME=/frontcontroller3.php
 REQUEST_URI=/frontcontroller3.php/a.phps
+PATH_INFO=/a.phps
 --FILE_EXTERNAL--
 frontcontroller.phar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/frontcontroller5.phpt b/ext/phar/tests/frontcontroller5.phpt
index 0ceb88d764..1265c771c9 100644
--- a/ext/phar/tests/frontcontroller5.phpt
+++ b/ext/phar/tests/frontcontroller5.phpt
@@ -3,8 +3,9 @@ Phar front controller index.php relocate
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller5.php/
+SCRIPT_NAME=/frontcontroller5.php
 REQUEST_URI=/frontcontroller5.php/
+PATH_INFO=/
 --FILE_EXTERNAL--
 frontcontroller.phar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/frontcontroller6.phpt b/ext/phar/tests/frontcontroller6.phpt
index 2f74c8f04d..7ec367285f 100644
--- a/ext/phar/tests/frontcontroller6.phpt
+++ b/ext/phar/tests/frontcontroller6.phpt
@@ -3,8 +3,9 @@ Phar front controller 404
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller6.php/notfound.php
+SCRIPT_NAME=/frontcontroller6.php
 REQUEST_URI=/frontcontroller6.php/notfound.php
+PATH_INFO=/notfound.php
 --FILE_EXTERNAL--
 frontcontroller.phar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/frontcontroller7.phpt b/ext/phar/tests/frontcontroller7.phpt
index c2e64336f0..28a82c6186 100644
--- a/ext/phar/tests/frontcontroller7.phpt
+++ b/ext/phar/tests/frontcontroller7.phpt
@@ -3,8 +3,9 @@ Phar front controller alternate index file
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller7.php/
+SCRIPT_NAME=/frontcontroller7.php
 REQUEST_URI=/frontcontroller7.php/
+PATH_INFO=/
 --FILE_EXTERNAL--
 frontcontroller2.phar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/frontcontroller8.phpt b/ext/phar/tests/frontcontroller8.phpt
index ea46f36b3c..e48f231538 100644
--- a/ext/phar/tests/frontcontroller8.phpt
+++ b/ext/phar/tests/frontcontroller8.phpt
@@ -3,8 +3,9 @@ Phar front controller no index file 404
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller8.php/
+SCRIPT_NAME=/frontcontroller8.php
 REQUEST_URI=/frontcontroller8.php/
+PATH_INFO=/
 --FILE_EXTERNAL--
 frontcontroller3.phar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/frontcontroller9.phpt b/ext/phar/tests/frontcontroller9.phpt
index e5dc64e711..877a71e74e 100644
--- a/ext/phar/tests/frontcontroller9.phpt
+++ b/ext/phar/tests/frontcontroller9.phpt
@@ -3,8 +3,9 @@ Phar front controller rewrite array
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller9.php/hi
+SCRIPT_NAME=/frontcontroller9.php
 REQUEST_URI=/frontcontroller9.php/hi
+PATH_INFO=/hi
 --FILE_EXTERNAL--
 frontcontroller3.phar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/tar/frontcontroller1.phar.phpt b/ext/phar/tests/tar/frontcontroller1.phar.phpt
index 3b21031a97..79699678f2 100644
--- a/ext/phar/tests/tar/frontcontroller1.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller1.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller other tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller1.phar.php/a.jpg
+SCRIPT_NAME=/frontcontroller1.phar.php
 REQUEST_URI=/frontcontroller1.phar.php/a.jpg
+PATH_INFO=/a.jpg
 --FILE_EXTERNAL--
 frontcontroller.phar.tar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/tar/frontcontroller10.phar.phpt b/ext/phar/tests/tar/frontcontroller10.phar.phpt
index f6b52b0496..b46fbbdf03 100644
--- a/ext/phar/tests/tar/frontcontroller10.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller10.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller rewrite array invalid tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller10.phar.php/hi
+SCRIPT_NAME=/frontcontroller10.phar.php
 REQUEST_URI=/frontcontroller10.phar.php/hi
+PATH_INFO=/hi
 --FILE_EXTERNAL--
 frontcontroller4.phar.tar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/tar/frontcontroller11.phar.phpt b/ext/phar/tests/tar/frontcontroller11.phar.phpt
index be66fd18d2..472abc3026 100644
--- a/ext/phar/tests/tar/frontcontroller11.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller11.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type extension is not a string tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller11.phar.php/a.php
+SCRIPT_NAME=/frontcontroller11.phar.php
 REQUEST_URI=/frontcontroller11.phar.php/a.php
+PATH_INFO=/a.php
 --FILE_EXTERNAL--
 frontcontroller5.phar.tar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/tar/frontcontroller12.phar.phpt b/ext/phar/tests/tar/frontcontroller12.phar.phpt
index 7427130191..e49a633bfa 100644
--- a/ext/phar/tests/tar/frontcontroller12.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller12.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type unknown int tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller12.phar.php/a.php
+SCRIPT_NAME=/frontcontroller12.phar.php
 REQUEST_URI=/frontcontroller12.phar.php/a.php
+PATH_INFO=/a.php
 --FILE_EXTERNAL--
 frontcontroller6.phar.tar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/tar/frontcontroller13.phar.phpt b/ext/phar/tests/tar/frontcontroller13.phar.phpt
index 6b2b4f3551..c90a2cc9c1 100644
--- a/ext/phar/tests/tar/frontcontroller13.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller13.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type not string/int tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller13.phar.php/a.php
+SCRIPT_NAME=/frontcontroller13.phar.php
 REQUEST_URI=/frontcontroller13.phar.php/a.php
+PATH_INFO=/a.php
 --FILE_EXTERNAL--
 frontcontroller7.phar.tar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/tar/frontcontroller14.phar.phpt b/ext/phar/tests/tar/frontcontroller14.phar.phpt
index f4bf1be3c1..90ee6fd757 100644
--- a/ext/phar/tests/tar/frontcontroller14.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller14.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type override, other tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller14.phar.php/a.jpg
+SCRIPT_NAME=/frontcontroller14.phar.php
 REQUEST_URI=/frontcontroller14.phar.php/a.jpg
+PATH_INFO=/a.jpg
 --FILE_EXTERNAL--
 frontcontroller8.phar.tar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/tar/frontcontroller15.phar.phpt b/ext/phar/tests/tar/frontcontroller15.phar.phpt
index 74c6058994..66911f373f 100644
--- a/ext/phar/tests/tar/frontcontroller15.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller15.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type override, Phar::PHPS tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller15.phar.php/a.php
+SCRIPT_NAME=/frontcontroller15.phar.php
 REQUEST_URI=/frontcontroller15.phar.php/a.php
+PATH_INFO=/a.php
 --FILE_EXTERNAL--
 frontcontroller8.phar.tar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/tar/frontcontroller16.phar.phpt b/ext/phar/tests/tar/frontcontroller16.phar.phpt
index 516effd66b..381336a29c 100644
--- a/ext/phar/tests/tar/frontcontroller16.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller16.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type override, Phar::PHP tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller16.phar.php/a.phps
+SCRIPT_NAME=/frontcontroller16.phar.php
 REQUEST_URI=/frontcontroller16.phar.php/a.phps
+PATH_INFO=/a.phps
 --FILE_EXTERNAL--
 frontcontroller8.phar.tar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/tar/frontcontroller17.phar.phpt b/ext/phar/tests/tar/frontcontroller17.phar.phpt
index d8a7910e5f..639f8b7d7f 100644
--- a/ext/phar/tests/tar/frontcontroller17.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller17.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type unknown tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller17.phar.php/fronk.gronk
+SCRIPT_NAME=/frontcontroller17.phar.php
 REQUEST_URI=/frontcontroller17.phar.php/fronk.gronk
+PATH_INFO=/fronk.gronk
 --FILE_EXTERNAL--
 frontcontroller8.phar.tar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/tar/frontcontroller18.phar.phpt b/ext/phar/tests/tar/frontcontroller18.phar.phpt
index 3d6f8c85aa..eb9875ca6f 100644
--- a/ext/phar/tests/tar/frontcontroller18.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller18.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller $_SERVER munging failure tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller18.phar.php/fronk.gronk
+SCRIPT_NAME=/frontcontroller18.phar.php
 REQUEST_URI=/frontcontroller18.phar.php/fronk.gronk
+PATH_INFO=/fronk.gronk
 --FILE_EXTERNAL--
 frontcontroller9.phar.tar
 --EXPECTF--
diff --git a/ext/phar/tests/tar/frontcontroller19.phar.phpt b/ext/phar/tests/tar/frontcontroller19.phar.phpt
index df5094b9d9..9f52f8824f 100644
--- a/ext/phar/tests/tar/frontcontroller19.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller19.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller $_SERVER munging failure 2 tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller19.phar.php/
+SCRIPT_NAME=/frontcontroller19.phar.php
 REQUEST_URI=/frontcontroller19.phar.php/
+PATH_INFO=/
 --FILE_EXTERNAL--
 frontcontroller10.phar.tar
 --EXPECTF--
diff --git a/ext/phar/tests/tar/frontcontroller2.phar.phpt b/ext/phar/tests/tar/frontcontroller2.phar.phpt
index 75b6cf6646..92b9665ba2 100644
--- a/ext/phar/tests/tar/frontcontroller2.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller2.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller PHP test tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller2.phar.php/a.php
+SCRIPT_NAME=/frontcontroller2.phar.php
 REQUEST_URI=/frontcontroller2.phar.php/a.php
+PATH_INFO=/a.php
 --FILE_EXTERNAL--
 frontcontroller.phar.tar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/tar/frontcontroller20.phar.phpt b/ext/phar/tests/tar/frontcontroller20.phar.phpt
index 362d20ffcf..3a83efb72f 100644
--- a/ext/phar/tests/tar/frontcontroller20.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller20.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller $_SERVER munging failure 3 tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller20.phar.php/
+SCRIPT_NAME=/frontcontroller20.phar.php
 REQUEST_URI=/frontcontroller20.phar.php/
+PATH_INFO=/
 --FILE_EXTERNAL--
 frontcontroller11.phar.tar
 --EXPECTF--
diff --git a/ext/phar/tests/tar/frontcontroller21.phar.phpt b/ext/phar/tests/tar/frontcontroller21.phar.phpt
index 0a80775746..f65690f1dc 100644
--- a/ext/phar/tests/tar/frontcontroller21.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller21.phar.phpt
@@ -3,8 +3,10 @@ Phar front controller $_SERVER munging success tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller21.phar.php/index.php
+SCRIPT_NAME=/frontcontroller21.phar.php
 REQUEST_URI=/frontcontroller21.phar.php/index.php?test=hi
+PATH_INFO=/index.php
+QUERY_STRING=test=hi
 --FILE_EXTERNAL--
 frontcontroller12.phar.tar
 --EXPECTHEADERS--
@@ -15,6 +17,6 @@ string(%d) "phar://%sfrontcontroller21.phar.php/index.php"
 string(%d) "phar://%sfrontcontroller21.phar.php/index.php"
 string(18) "/index.php?test=hi"
 string(37) "/frontcontroller21.phar.php/index.php"
-string(37) "/frontcontroller21.phar.php/index.php"
+string(27) "/frontcontroller21.phar.php"
 string(%d) "%sfrontcontroller21.phar.php"
 string(45) "/frontcontroller21.phar.php/index.php?test=hi"
\ No newline at end of file
diff --git a/ext/phar/tests/tar/frontcontroller3.phar.phpt b/ext/phar/tests/tar/frontcontroller3.phar.phpt
index 5176853b3b..9980ea2d29 100644
--- a/ext/phar/tests/tar/frontcontroller3.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller3.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller phps tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller3.phar.php/a.phps
+SCRIPT_NAME=/frontcontroller3.phar.php
 REQUEST_URI=/frontcontroller3.phar.php/a.phps
+PATH_INFO=/a.phps
 --FILE_EXTERNAL--
 frontcontroller.phar.tar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/tar/frontcontroller5.phar.phpt b/ext/phar/tests/tar/frontcontroller5.phar.phpt
index ea942c1468..a8c122b834 100644
--- a/ext/phar/tests/tar/frontcontroller5.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller5.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller index.php relocate tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller5.phar.php/
+SCRIPT_NAME=/frontcontroller5.phar.php
 REQUEST_URI=/frontcontroller5.phar.php/
+PATH_INFO=/
 --FILE_EXTERNAL--
 frontcontroller.phar.tar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/tar/frontcontroller6.phar.phpt b/ext/phar/tests/tar/frontcontroller6.phar.phpt
index 4bf682566e..b523154a6e 100644
--- a/ext/phar/tests/tar/frontcontroller6.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller6.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller 404 tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller6.phar.php/notfound.php
+SCRIPT_NAME=/frontcontroller6.phar.php
 REQUEST_URI=/frontcontroller6.phar.php/notfound.php
+PATH_INFO=/notfound.php
 --FILE_EXTERNAL--
 frontcontroller.phar.tar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/tar/frontcontroller7.phar.phpt b/ext/phar/tests/tar/frontcontroller7.phar.phpt
index 47aaefdf58..b15ca07ff4 100644
--- a/ext/phar/tests/tar/frontcontroller7.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller7.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller alternate index file tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller7.phar.php/
+SCRIPT_NAME=/frontcontroller7.phar.php
 REQUEST_URI=/frontcontroller7.phar.php/
+PATH_INFO=/
 --FILE_EXTERNAL--
 frontcontroller2.phar.tar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/tar/frontcontroller8.phar.phpt b/ext/phar/tests/tar/frontcontroller8.phar.phpt
index 0b55e3bd14..22ddf22af7 100644
--- a/ext/phar/tests/tar/frontcontroller8.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller8.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller no index file 404 tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller8.phar.php/
+SCRIPT_NAME=/frontcontroller8.phar.php
 REQUEST_URI=/frontcontroller8.phar.php/
+PATH_INFO=/
 --FILE_EXTERNAL--
 frontcontroller3.phar.tar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/tar/frontcontroller9.phar.phpt b/ext/phar/tests/tar/frontcontroller9.phar.phpt
index e814398641..93540a68b4 100644
--- a/ext/phar/tests/tar/frontcontroller9.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller9.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller rewrite array tar-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller9.phar.php/hi
+SCRIPT_NAME=/frontcontroller9.phar.php
 REQUEST_URI=/frontcontroller9.phar.php/hi
+PATH_INFO=/hi
 --FILE_EXTERNAL--
 frontcontroller3.phar.tar
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/zip/frontcontroller1.phar.phpt b/ext/phar/tests/zip/frontcontroller1.phar.phpt
index 2be7ab478c..9caef7572f 100644
--- a/ext/phar/tests/zip/frontcontroller1.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller1.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller other zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller1.phar.php/a.jpg
+SCRIPT_NAME=/frontcontroller1.phar.php
 REQUEST_URI=/frontcontroller1.phar.php/a.jpg
+PATH_INFO=/a.jpg
 --FILE_EXTERNAL--
 frontcontroller.phar.zip
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/zip/frontcontroller10.phar.phpt b/ext/phar/tests/zip/frontcontroller10.phar.phpt
index 025becd670..275c47f809 100644
--- a/ext/phar/tests/zip/frontcontroller10.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller10.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller rewrite array invalid zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller10.phar.php/hi
+SCRIPT_NAME=/frontcontroller10.phar.php
 REQUEST_URI=/frontcontroller10.phar.php/hi
+PATH_INFO=/hi
 --FILE_EXTERNAL--
 frontcontroller4.phar.zip
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/zip/frontcontroller11.phar.phpt b/ext/phar/tests/zip/frontcontroller11.phar.phpt
index 789138f329..8c63e6b7dd 100644
--- a/ext/phar/tests/zip/frontcontroller11.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller11.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type extension is not a string zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller11.phar.php/a.php
+SCRIPT_NAME=/frontcontroller11.phar.php
 REQUEST_URI=/frontcontroller11.phar.php/a.php
+PATH_INFO=/a.php
 --FILE_EXTERNAL--
 frontcontroller5.phar.zip
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/zip/frontcontroller12.phar.phpt b/ext/phar/tests/zip/frontcontroller12.phar.phpt
index 1b5102aa19..60a2f8ef24 100644
--- a/ext/phar/tests/zip/frontcontroller12.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller12.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type unknown int zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller12.phar.php/a.php
+SCRIPT_NAME=/frontcontroller12.phar.php
 REQUEST_URI=/frontcontroller12.phar.php/a.php
+PATH_INFO=/a.php
 --FILE_EXTERNAL--
 frontcontroller6.phar.zip
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/zip/frontcontroller13.phar.phpt b/ext/phar/tests/zip/frontcontroller13.phar.phpt
index 5fc4b834e0..20fa512f56 100644
--- a/ext/phar/tests/zip/frontcontroller13.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller13.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type not string/int zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller13.phar.php/a.php
+SCRIPT_NAME=/frontcontroller13.phar.php
 REQUEST_URI=/frontcontroller13.phar.php/a.php
+PATH_INFO=/a.php
 --FILE_EXTERNAL--
 frontcontroller7.phar.zip
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/zip/frontcontroller14.phar.phpt b/ext/phar/tests/zip/frontcontroller14.phar.phpt
index 7a3aaa57b2..06ced558c4 100644
--- a/ext/phar/tests/zip/frontcontroller14.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller14.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type override, other zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller14.phar.php/a.jpg
+SCRIPT_NAME=/frontcontroller14.phar.php
 REQUEST_URI=/frontcontroller14.phar.php/a.jpg
+PATH_INFO=/a.jpg
 --FILE_EXTERNAL--
 frontcontroller8.phar.zip
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/zip/frontcontroller15.phar.phpt b/ext/phar/tests/zip/frontcontroller15.phar.phpt
index 33ac6739cd..64fb212cff 100644
--- a/ext/phar/tests/zip/frontcontroller15.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller15.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type override, Phar::PHPS zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller15.phar.php/a.php
+SCRIPT_NAME=/frontcontroller15.phar.php
 REQUEST_URI=/frontcontroller15.phar.php/a.php
+PATH_INFO=/a.php
 --FILE_EXTERNAL--
 frontcontroller8.phar.zip
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/zip/frontcontroller16.phar.phpt b/ext/phar/tests/zip/frontcontroller16.phar.phpt
index 924996b00b..366e57501b 100644
--- a/ext/phar/tests/zip/frontcontroller16.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller16.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type override, Phar::PHP zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller16.phar.php/a.phps
+SCRIPT_NAME=/frontcontroller16.phar.php
 REQUEST_URI=/frontcontroller16.phar.php/a.phps
+PATH_INFO=/a.phps
 --FILE_EXTERNAL--
 frontcontroller8.phar.zip
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/zip/frontcontroller17.phar.phpt b/ext/phar/tests/zip/frontcontroller17.phar.phpt
index 36054b8971..6dca6132f1 100644
--- a/ext/phar/tests/zip/frontcontroller17.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller17.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller mime type unknown zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller17.phar.php/fronk.gronk
+SCRIPT_NAME=/frontcontroller17.phar.php
 REQUEST_URI=/frontcontroller17.phar.php/fronk.gronk
+PATH_INFO=/fronk.gronk
 --FILE_EXTERNAL--
 frontcontroller8.phar.zip
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/zip/frontcontroller18.phar.phpt b/ext/phar/tests/zip/frontcontroller18.phar.phpt
index 8d9139820e..d5f6735728 100644
--- a/ext/phar/tests/zip/frontcontroller18.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller18.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller $_SERVER munging failure zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller18.phar.php/fronk.gronk
+SCRIPT_NAME=/frontcontroller18.phar.php
 REQUEST_URI=/frontcontroller18.phar.php/fronk.gronk
+PATH_INFO=/fronk.gronk
 --FILE_EXTERNAL--
 frontcontroller9.phar.zip
 --EXPECTF--
diff --git a/ext/phar/tests/zip/frontcontroller19.phar.phpt b/ext/phar/tests/zip/frontcontroller19.phar.phpt
index 8057448a60..5ad74530a1 100644
--- a/ext/phar/tests/zip/frontcontroller19.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller19.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller $_SERVER munging failure 2 zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller19.phar.php/
+SCRIPT_NAME=/frontcontroller19.phar.php
 REQUEST_URI=/frontcontroller19.phar.php/
+PATH_INFO=/
 --FILE_EXTERNAL--
 frontcontroller10.phar.zip
 --EXPECTF--
diff --git a/ext/phar/tests/zip/frontcontroller2.phar.phpt b/ext/phar/tests/zip/frontcontroller2.phar.phpt
index ac64424ecb..3a2c5bc9cb 100644
--- a/ext/phar/tests/zip/frontcontroller2.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller2.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller PHP test zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller2.phar.php/a.php
+SCRIPT_NAME=/frontcontroller2.phar.php
 REQUEST_URI=/frontcontroller2.phar.php/a.php
+PATH_INFO=/a.php
 --FILE_EXTERNAL--
 frontcontroller.phar.zip
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/zip/frontcontroller20.phar.phpt b/ext/phar/tests/zip/frontcontroller20.phar.phpt
index 4b5859b33d..c19052b192 100644
--- a/ext/phar/tests/zip/frontcontroller20.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller20.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller $_SERVER munging failure 3 zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller20.phar.php/
+SCRIPT_NAME=/frontcontroller20.phar.php
 REQUEST_URI=/frontcontroller20.phar.php/
+PATH_INFO=/
 --FILE_EXTERNAL--
 frontcontroller11.phar.zip
 --EXPECTF--
diff --git a/ext/phar/tests/zip/frontcontroller21.phar.phpt b/ext/phar/tests/zip/frontcontroller21.phar.phpt
index 0acdee1326..3f3e9f1add 100644
--- a/ext/phar/tests/zip/frontcontroller21.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller21.phar.phpt
@@ -3,8 +3,10 @@ Phar front controller $_SERVER munging success zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller21.phar.php/index.php
+SCRIPT_NAME=/frontcontroller21.phar.php
 REQUEST_URI=/frontcontroller21.phar.php/index.php?test=hi
+PATH_INFO=/index.php
+QUERY_STRING=test=hi
 --FILE_EXTERNAL--
 frontcontroller12.phar.zip
 --EXPECTHEADERS--
@@ -15,6 +17,6 @@ string(%d) "phar://%sfrontcontroller21.phar.php/index.php"
 string(%d) "phar://%sfrontcontroller21.phar.php/index.php"
 string(18) "/index.php?test=hi"
 string(37) "/frontcontroller21.phar.php/index.php"
-string(37) "/frontcontroller21.phar.php/index.php"
+string(27) "/frontcontroller21.phar.php"
 string(%d) "%sfrontcontroller21.phar.php"
 string(45) "/frontcontroller21.phar.php/index.php?test=hi"
\ No newline at end of file
diff --git a/ext/phar/tests/zip/frontcontroller3.phar.phpt b/ext/phar/tests/zip/frontcontroller3.phar.phpt
index c34f4de8de..4f3ed2fb0b 100644
--- a/ext/phar/tests/zip/frontcontroller3.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller3.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller phps zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller3.phar.php/a.phps
+SCRIPT_NAME=/frontcontroller3.phar.php
 REQUEST_URI=/frontcontroller3.phar.php/a.phps
+PATH_INFO=/a.phps
 --FILE_EXTERNAL--
 frontcontroller.phar.zip
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/zip/frontcontroller5.phar.phpt b/ext/phar/tests/zip/frontcontroller5.phar.phpt
index 1e69240a0a..b3b04a09ee 100644
--- a/ext/phar/tests/zip/frontcontroller5.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller5.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller index.php relocate zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller5.phar.php/
+SCRIPT_NAME=/frontcontroller5.phar.php
 REQUEST_URI=/frontcontroller5.phar.php/
+PATH_INFO=/
 --FILE_EXTERNAL--
 frontcontroller.phar.zip
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/zip/frontcontroller6.phar.phpt b/ext/phar/tests/zip/frontcontroller6.phar.phpt
index 4f3435be22..c881d29661 100644
--- a/ext/phar/tests/zip/frontcontroller6.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller6.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller 404 zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller6.phar.php/notfound.php
+SCRIPT_NAME=/frontcontroller6.phar.php
 REQUEST_URI=/frontcontroller6.phar.php/notfound.php
+PATH_INFO=/notfound.php
 --FILE_EXTERNAL--
 frontcontroller.phar.zip
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/zip/frontcontroller7.phar.phpt b/ext/phar/tests/zip/frontcontroller7.phar.phpt
index 2ce206fc21..0cc9671f41 100644
--- a/ext/phar/tests/zip/frontcontroller7.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller7.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller alternate index file zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller7.phar.php/
+SCRIPT_NAME=/frontcontroller7.phar.php
 REQUEST_URI=/frontcontroller7.phar.php/
+PATH_INFO=/
 --FILE_EXTERNAL--
 frontcontroller2.phar.zip
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/zip/frontcontroller8.phar.phpt b/ext/phar/tests/zip/frontcontroller8.phar.phpt
index dd806b6cf0..0e596ddd1e 100644
--- a/ext/phar/tests/zip/frontcontroller8.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller8.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller no index file 404 zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller8.phar.php/
+SCRIPT_NAME=/frontcontroller8.phar.php
 REQUEST_URI=/frontcontroller8.phar.php/
+PATH_INFO=/
 --FILE_EXTERNAL--
 frontcontroller3.phar.zip
 --EXPECTHEADERS--
diff --git a/ext/phar/tests/zip/frontcontroller9.phar.phpt b/ext/phar/tests/zip/frontcontroller9.phar.phpt
index 70dbaa05ad..6c116e2955 100644
--- a/ext/phar/tests/zip/frontcontroller9.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller9.phar.phpt
@@ -3,8 +3,9 @@ Phar front controller rewrite array zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --ENV--
-SCRIPT_NAME=/frontcontroller9.phar.php/hi
+SCRIPT_NAME=/frontcontroller9.phar.php
 REQUEST_URI=/frontcontroller9.phar.php/hi
+PATH_INFO=/hi
 --FILE_EXTERNAL--
 frontcontroller3.phar.zip
 --EXPECTHEADERS--