diff options
| author | Anatol Belski <ab@php.net> | 2018-04-24 10:49:15 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-04-24 10:49:15 +0200 |
| commit | 1df43a086faa1a704d9a34a5f7d83b9a4d58e5e4 (patch) | |
| tree | 23f526a2644168a8af6a077ec95a5ed4745e0add | |
| parent | 4c06d929c048158a623a6f285af006f8531d372b (diff) | |
| parent | 919ead11578be5c8bd954d8322e92c484b62facb (diff) | |
| download | php-git-1df43a086faa1a704d9a34a5f7d83b9a4d58e5e4.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix test portability
| -rw-r--r-- | ext/iconv/tests/bug76249.phpt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/iconv/tests/bug76249.phpt b/ext/iconv/tests/bug76249.phpt index 1503f0bc81..0a2dcaed2f 100644 --- a/ext/iconv/tests/bug76249.phpt +++ b/ext/iconv/tests/bug76249.phpt @@ -7,12 +7,14 @@ Bug #76249 (stream filter convert.iconv leads to infinite loop on invalid sequen $fh = fopen('php://memory', 'rw'); fwrite($fh, "abc"); rewind($fh); -stream_filter_append($fh, 'convert.iconv.ucs-2/utf8//IGNORE', STREAM_FILTER_READ, []); +if (false === @stream_filter_append($fh, 'convert.iconv.ucs-2/utf8//IGNORE', STREAM_FILTER_READ, [])) { + stream_filter_append($fh, 'convert.iconv.ucs-2/utf-8//IGNORE', STREAM_FILTER_READ, []); +} $a = stream_get_contents($fh); var_dump(strlen($a)); ?> DONE --EXPECTF-- -Warning: stream_get_contents(): iconv stream filter ("ucs-2"=>"utf8//IGNORE"): invalid multibyte sequence in %sbug76249.php on line %d +Warning: stream_get_contents(): iconv stream filter ("ucs-2"=>"utf%A8//IGNORE"): invalid multibyte sequence in %sbug76249.php on line %d int(3) DONE |