New upstream version 5.6.0~rc4+dfsg

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 829f2986e..0b5953acf 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 bf50c6e80..6520abeca 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 bb93996d6..31bb61eda 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 74caa2c81..143b83659 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"