diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-11-01 20:24:10 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-11-01 20:24:10 +0100 |
| commit | 8957ff36b38a560cfa9a2a3f2a1271cfb2fcbeb9 (patch) | |
| tree | bdb381697c6c3a6c95b3a39e6f1ff35320a4b091 | |
| parent | 197def7233dbbd4c09342d1987836556186ac9ed (diff) | |
| parent | 2eacb53fc44ce4a0f16113eec96dfc0bb5ea52b6 (diff) | |
| download | php-git-8957ff36b38a560cfa9a2a3f2a1271cfb2fcbeb9.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
| -rw-r--r-- | Zend/tests/debug_info-error-resource.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/file/bug43008.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/streams/bug40459.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/streams/bug71323.phpt | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/Zend/tests/debug_info-error-resource.phpt b/Zend/tests/debug_info-error-resource.phpt index ebdc37e534..e3bd542949 100644 --- a/Zend/tests/debug_info-error-resource.phpt +++ b/Zend/tests/debug_info-error-resource.phpt @@ -1,5 +1,7 @@ --TEST-- Testing __debugInfo() magic method with bad returns RESOURCE +--INI-- +allow_url_fopen=1 --FILE-- <?php diff --git a/ext/standard/tests/file/bug43008.phpt b/ext/standard/tests/file/bug43008.phpt index d2e3efdb58..3c9411d329 100644 --- a/ext/standard/tests/file/bug43008.phpt +++ b/ext/standard/tests/file/bug43008.phpt @@ -4,6 +4,8 @@ Bug #43008 (php://filter uris ignore url encoded filternames and can't handle sl <?php if (!extension_loaded("iconv")) die("skip iconv extension not available"); ?> +--INI-- +allow_url_fopen=1 --FILE-- <?php $url = b"" diff --git a/ext/standard/tests/streams/bug40459.phpt b/ext/standard/tests/streams/bug40459.phpt index 8ee4363ed9..902a1f9111 100644 --- a/ext/standard/tests/streams/bug40459.phpt +++ b/ext/standard/tests/streams/bug40459.phpt @@ -1,5 +1,7 @@ --TEST-- bug 40459 - Test whether the constructor of the user-space stream wrapper is called when stream functions are called +--INI-- +allow_url_fopen=1 --FILE-- <?php // Test whether the constructor of the user-space stream wrapper is called when stream functions are called diff --git a/ext/standard/tests/streams/bug71323.phpt b/ext/standard/tests/streams/bug71323.phpt index dfe0bd8afe..29d784719f 100644 --- a/ext/standard/tests/streams/bug71323.phpt +++ b/ext/standard/tests/streams/bug71323.phpt @@ -1,5 +1,7 @@ --TEST-- Bug #71323: Output of stream_get_meta_data can be falsified by its input +--INI-- +allow_url_fopen=1 --FILE-- <?php $file = 'data:text/plain;z=y;uri=eviluri;mediatype=wut?;mediatype2=hello,somedata'; |