diff options
| author | Xinchen Hui <laruence@php.net> | 2014-07-09 18:35:13 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-07-09 18:35:13 +0800 |
| commit | 674af28607295a66be121d7fea9981ec84950aaa (patch) | |
| tree | 23990d93365dd58d6201b0fa9a70c214c4cf6b52 /ext | |
| parent | 25fe17bdcd3e88adc4a2b020113a7bacf343cf7d (diff) | |
| parent | 2c71ea1a99b5dc6c71383e71835142de7b79d99b (diff) | |
| download | php-git-674af28607295a66be121d7fea9981ec84950aaa.tar.gz | |
Merge branch 'PHP-5.6'
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/phar/tests/cache_list/frontcontroller21.phpt | 3 | ||||
| -rw-r--r-- | ext/phar/tests/frontcontroller21.phpt | 3 | ||||
| -rw-r--r-- | ext/phar/tests/tar/frontcontroller21.phar.phpt | 3 | ||||
| -rw-r--r-- | ext/phar/tests/zip/frontcontroller21.phar.phpt | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/ext/phar/tests/cache_list/frontcontroller21.phpt b/ext/phar/tests/cache_list/frontcontroller21.phpt index 829f2986e9..0b5953acf0 100644 --- a/ext/phar/tests/cache_list/frontcontroller21.phpt +++ b/ext/phar/tests/cache_list/frontcontroller21.phpt @@ -3,6 +3,7 @@ Phar front controller $_SERVER munging success [cache_list] --INI-- default_charset=UTF-8 phar.cache_list={PWD}/frontcontroller21.php +cgi.fix_pathinfo=1 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -22,4 +23,4 @@ string(18) "/index.php?test=hi" 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 +string(40) "/frontcontroller21.php/index.php?test=hi" diff --git a/ext/phar/tests/frontcontroller21.phpt b/ext/phar/tests/frontcontroller21.phpt index bf50c6e801..6520abecae 100644 --- a/ext/phar/tests/frontcontroller21.phpt +++ b/ext/phar/tests/frontcontroller21.phpt @@ -2,6 +2,7 @@ Phar front controller $_SERVER munging success --INI-- default_charset=UTF-8 +cgi.fix_pathinfo=1 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -21,4 +22,4 @@ string(18) "/index.php?test=hi" 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 +string(40) "/frontcontroller21.php/index.php?test=hi" diff --git a/ext/phar/tests/tar/frontcontroller21.phar.phpt b/ext/phar/tests/tar/frontcontroller21.phar.phpt index bb93996d69..31bb61edab 100644 --- a/ext/phar/tests/tar/frontcontroller21.phar.phpt +++ b/ext/phar/tests/tar/frontcontroller21.phar.phpt @@ -2,6 +2,7 @@ Phar front controller $_SERVER munging success tar-based --INI-- default_charset=UTF-8 +cgi.fix_pathinfo=1 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --ENV-- @@ -21,4 +22,4 @@ string(18) "/index.php?test=hi" 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 +string(45) "/frontcontroller21.phar.php/index.php?test=hi" diff --git a/ext/phar/tests/zip/frontcontroller21.phar.phpt b/ext/phar/tests/zip/frontcontroller21.phar.phpt index 74caa2c814..143b83659a 100644 --- a/ext/phar/tests/zip/frontcontroller21.phar.phpt +++ b/ext/phar/tests/zip/frontcontroller21.phar.phpt @@ -2,6 +2,7 @@ Phar front controller $_SERVER munging success zip-based --INI-- default_charset=UTF-8 +cgi.fix_pathinfo=1 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> @@ -22,4 +23,4 @@ string(18) "/index.php?test=hi" 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 +string(45) "/frontcontroller21.phar.php/index.php?test=hi" |