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

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index ed31877f65d372a521bb69f05ffc404306789e26..434e7d9812e2cf62c037127438e7841e88b25755 100755 (executable)
--- 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 296acfc8cfb5a45d0e58d6f0a914cd5b3b61c03a..b925c637ea9c7df1e8f24773eb9a749de44f7d8c 100644 (file)
--- 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 a0c53afb731fbf05977d2fc0bb5f0eadaf6eec59..a96ffe11599250d50e0884ed404c6bf1f6c17dfb 100644 (file)
--- 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 3da89977cba44dd68e1b06b8ccaba0fac73c5f7c..d1e8893eb3b0590fd53d822cbe6e7838ae49f9e3 100644 (file)
--- 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 8054fa53a348239fd18ebbda9910749326e8fa12..0eb0ef7e1f3aea1fedbf54bb94e66f4625d34344 100644 (file)
--- 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 eb3c01ff9a484f92dd11903a6b8546280e75e34e..07ec55b0c72971f7680289bf9b77d2ac33cb7114 100644 (file)
--- 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 0a7e61aff076d1fd50fc5cc092d8952c1f8e575b..508efc8cd0525d4f268371cddf9bcb6ab0f1701a 100644 (file)
--- 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 21fb0692313e1bf4695d6e82906a0eb94577e91b..fb75199ec4b0858851a0dcea71a790a2933a8cf4 100644 (file)
--- 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 e68a0c0e39c1a5f9d7fb5b517be74f1435191bb6..81210ac2eb14bad7261fd94a8d21e3dfaf6bcd3d 100644 (file)
--- 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 3aea1262decb9f97b81b8107206ea1d2e19f54bf..e89c9e08e373252560b267641fbd4c202b2dffe0 100644 (file)
--- 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 e2ae111d9b48cd9da411634ee7cd98b1451234a3..4c50afb5fc0e59330669233e648a0d428ea2a8ec 100644 (file)
--- 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 b5b9a23a646472300c15e3e1d67728223bb6dfe1..d01cf1e31e17272d99709b641774dac0d752da8e 100644 (file)
--- 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 69573f95d3fe1fdfcff120bbb69ca36d6c560e53..aed4afff42fc3b106b7729af0db60a37f4390d07 100644 (file)
--- 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 dd07356da5f55e63bd4a2ea948389365709c0e21..d55d8a14e106912c4ab679ca817f5750ce543a89 100644 (file)
--- 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 b9bb6df92c381142f2c83190510aac57af37c34b..852320914256bb8a9d5bcb55ecc9dc3c407121f1 100644 (file)
--- 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 8053b61bf284313abdf4fb3fdf046c67fabc8521..c69b7f5037080df7d549dd13d4bc1e3e20c224ed 100644 (file)
--- 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 932dd0d8c07396e8cdb317db64d7f571b068433b..c85bfc635f49277fa1c844cce1d4d9b7125f8d31 100644 (file)
--- 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 0ceb88d76403a7b4f5c8d79faf250518d0793170..1265c771c930af216441c1a61df89354fe50ce35 100644 (file)
--- 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 2f74c8f04dfc6fad0d85acf88d20a9a600887dd6..7ec367285f1508badd3f45a1c4e9f055c1b0fa83 100644 (file)
--- 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 c2e64336f0ecfb971a52a0c8d1aa927b521b6a3e..28a82c6186dad360ae6cef190eb874401fc1de6d 100644 (file)
--- 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 ea46f36b3ce564ebdb825d45faac8860474518c6..e48f231538ff3cb7afc90c91e1e0959c4ba1a625 100644 (file)
--- 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 e5dc64e711759777bb1d3bfebfe54cae93107d1d..877a71e74ecaa00fce97d68332a8356e6549e097 100644 (file)
--- 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 3b21031a971cdbfead28f361d47886013c8fe0ed..79699678f27e7bf1d24e3c61aeb434dacfc08ae2 100644 (file)
--- 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 f6b52b0496089944880792b7a95314e692317fa5..b46fbbdf03ff1da72482105aeaf79af9d6251621 100644 (file)
--- 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 be66fd18d2ef30631ff07e35a037b86d8ba49091..472abc30265ddda542ea826adc4e716d07139850 100644 (file)
--- 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 74271301914f50a7c06379dd4408dad425a74865..e49a633bfad216b4448d3a7fdfdb1b3fae7c4fd3 100644 (file)
--- 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 6b2b4f355117a6991f8b2ac59056ada558c04113..c90a2cc9c1eccaa0d4660d2c16ed14445ec31e1c 100644 (file)
--- 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 f4bf1be3c1ad04e92ec9578c660dd34ebd0dace7..90ee6fd7577c87ed29a773601af8ab8f824d306d 100644 (file)
--- 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 74c60589946e9dabc7e0b333d57453cef83475d7..66911f373f6f43df5b0148f3563301459c6641c8 100644 (file)
--- 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 516effd66b2edd98670c3161e766e5d999018a58..381336a29c5dd486e2bd5b372bd3468c98bd986a 100644 (file)
--- 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 d8a7910e5f266b18c107d7f71f3ed989f2cd464c..639f8b7d7f3e4c2a2dd443fb893e3c4bc51a01c2 100644 (file)
--- 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 3d6f8c85aa388b314292d10e583d356e11ecca3d..eb9875ca6f579eb447303b1afb753ebfe8987f6c 100644 (file)
--- 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 df5094b9d926a12ac1b159f0281a5fc2e7a1c201..9f52f8824f0fb163a4a827c34e8774a456594a7b 100644 (file)
--- 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 75b6cf66460b4c55fe0b9f3275da05e8bcc2616d..92b9665ba20c2baf96423c7307cd9291835b0517 100644 (file)
--- 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 362d20ffcf34f1dd8882cc6413223bebf240796e..3a83efb72fe47e28a2125d7d7f8247523fb338f0 100644 (file)
--- 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 0a807757464a55dd5ca3e32f02a68dacf36a1675..f65690f1dcde70a607079a2c4babcc39cc97f561 100644 (file)
--- 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 5176853b3b975d40e5e2a2e1a32261662664f57d..9980ea2d29c601151155bc71f985bbbdf607b9fe 100644 (file)
--- 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 ea942c1468b936125e502c9ee891213604e1c614..a8c122b834afe066ff44e11e5e4024b10aba0b79 100644 (file)
--- 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 4bf682566e63aa39caa26be1b0014d453cdaee06..b523154a6e9c580dce205d1653da885bce239d2b 100644 (file)
--- 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 47aaefdf5882006b3e881dff5815cf92b74702e8..b15ca07ff42a2423d1b4806c9c11fbfdeb646e61 100644 (file)
--- 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 0b55e3bd14a7bbedecf0b8c8ea4e66fe776dcae2..22ddf22af7bbad0b9648e2162293355ed6e6506b 100644 (file)
--- 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 e81439864149e19f878d37b12ca7b799ac6745d0..93540a68b4af00a09fa0ed0b5747610887071a8c 100644 (file)
--- 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 2be7ab478c8e68171b6c5038281617351e0d7fe4..9caef7572f6982f4bba9c8a674f295d56485c100 100644 (file)
--- 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 025becd6709e946e51473c47fd59b01c9495a44d..275c47f809bad96e71bef6e563f64d79a6abf3b6 100644 (file)
--- 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 789138f329b1756d11b342281ea785d3db8cfbcc..8c63e6b7ddb85be3a0c8fffb03e197ae7bb7fe5f 100644 (file)
--- 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 1b5102aa199c1c3659d6f62129bd95fdd36f90b9..60a2f8ef2471f2a5539ee8993db3d3fe57725895 100644 (file)
--- 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 5fc4b834e083f165d0832c8662bb55869d5196ea..20fa512f56e562d8f3d8e71c2d93e9599247ad5c 100644 (file)
--- 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 7a3aaa57b2e2278fc6bf405eec642b5b66e0945b..06ced558c499c5fa1f6b5d4609429ed375170383 100644 (file)
--- 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 33ac6739cd26619538a6063c8c8706ffb4c7a59f..64fb212cffbdf34afc0947dea5c9cf3923f47775 100644 (file)
--- 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 924996b00b639b4263e38e7c35ade54b8a68ac74..366e57501b5373ec4071bea95432b573d5fe7b43 100644 (file)
--- 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 36054b8971c8b209728735f09911a85740fc5794..6dca6132f17116683983d9a7c2b56d28ab15c97f 100644 (file)
--- 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 8d9139820eb0267a2d1f20dd0107840c8db2493c..d5f673572837dab4b9199e239707706e07934b90 100644 (file)
--- 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 8057448a6085a94e8b4f23cf5f9c340bd59f4b19..5ad74530a1afcb24a62f1366d1400106fbd385a8 100644 (file)
--- 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 ac64424ecb118be97100ed4e52108f0e65510a45..3a2c5bc9cb2787548d0611df09ffa0cc6547aeda 100644 (file)
--- 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 4b5859b33dba496486298bb9d59a8ea1f653fd9d..c19052b192a825f2d53aee61191d3254239f878f 100644 (file)
--- 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 0acdee13266299daaaff448fde34c104bc07a0a3..3f3e9f1add3f39236a6fa64c6df76a2d2ea7c345 100644 (file)
--- 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 c34f4de8def577c5dd853fd38c251c6fbe97fef0..4f3ed2fb0b9a611f78418d9abb9e3ccc79dc7d5d 100644 (file)
--- 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 1e69240a0abd2a46f3852578ac4c49db9f358e6f..b3b04a09eeccb7b081c65ca3726b62eeb3fcf291 100644 (file)
--- 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 4f3435be22217a157db0223574f4cdaa95e99b43..c881d29661c1646fca93bb750dd3609b9f475a86 100644 (file)
--- 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 2ce206fc21c6760e3ad94513ce9812d5f6b91d30..0cc9671f414239ecbbf9a79c0e1fd1349d2e906a 100644 (file)
--- 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 dd806b6cf0a3d18314b654efeb52e26401da8636..0e596ddd1e1ad3f1191a22f75997bf30bc67ba6a 100644 (file)
--- 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 70dbaa05addbd135464f7b024200e0cb96e6c7fe..6c116e2955745b7a8af6fcfb66be58996b2f94ac 100644 (file)
--- 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--