diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-02-01 19:15:19 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-02-01 19:15:19 -0800 |
| commit | 24167095a5fbc4ba6cd14ce5aa85ba000d9d4980 (patch) | |
| tree | dc61dc0e3f232caaf6de1ecc41e9b3506b40618c /ext/zlib | |
| parent | 20c38facfd4494cbb480f3ddc17c26ca32ac511a (diff) | |
| parent | 2a7d8c0a06de8123034b136b0c717576b6e36fae (diff) | |
| download | php-git-24167095a5fbc4ba6cd14ce5aa85ba000d9d4980.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6.18
* PHP-5.5:
fix tests
fix NEWS
update NEWS
Diffstat (limited to 'ext/zlib')
| -rw-r--r-- | ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt b/ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt index 2f76b46d96..a9d208eeaa 100644 --- a/ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt +++ b/ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt @@ -25,6 +25,12 @@ gzclose($h); --EXPECTF-- no wrapper array(7) { + ["timed_out"]=> + bool(false) + ["blocked"]=> + bool(true) + ["eof"]=> + bool(false) ["stream_type"]=> string(4) "ZLIB" ["mode"]=> @@ -33,16 +39,16 @@ array(7) { int(0) ["seekable"]=> bool(true) +} + +with wrapper +array(9) { ["timed_out"]=> bool(false) ["blocked"]=> bool(true) ["eof"]=> bool(false) -} - -with wrapper -array(9) { ["wrapper_type"]=> string(4) "ZLIB" ["stream_type"]=> @@ -55,11 +61,5 @@ array(9) { bool(true) ["uri"]=> string(%d) "compress.zlib://%s/004.txt.gz" - ["timed_out"]=> - bool(false) - ["blocked"]=> - bool(true) - ["eof"]=> - bool(false) } ===DONE===
\ No newline at end of file |