diff options
| author | Anatol Belski <ab@php.net> | 2016-08-17 00:58:54 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-08-17 00:58:54 +0200 |
| commit | abc7d1f14072b841a845a60de38f72e5fcf602cc (patch) | |
| tree | 8e454d6c53512ee64451603a83b606143ecfeef0 /ext | |
| parent | 620bb201c49479dea32dedca9323ed76474bfdcf (diff) | |
| parent | 20f76efb78b1fbe7b9af505ce2995436516e473a (diff) | |
| download | php-git-abc7d1f14072b841a845a60de38f72e5fcf602cc.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix test
fix blocking pipe stream option value
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/tests/streams/bug72857.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/tests/streams/bug72857.phpt b/ext/standard/tests/streams/bug72857.phpt index fdf0ff1dc6..97d145b595 100644 --- a/ext/standard/tests/streams/bug72857.phpt +++ b/ext/standard/tests/streams/bug72857.phpt @@ -15,6 +15,6 @@ Bug #72857 stream_socket_recvfrom read access violation ?> ==DONE== --EXPECT-- -string(0) "" +bool(false) NULL ==DONE== |