diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-18 15:25:59 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-22 17:17:28 +0200 |
| commit | d59aac58b3e7da7ad01a194fe9840d89725ea229 (patch) | |
| tree | 5cfc4509f8aa6f9cb0c49df3530fb82c5b0456df /ext/bz2/tests | |
| parent | c817b8020c8a835946681ca94b9257e78e64dad3 (diff) | |
| download | php-git-d59aac58b3e7da7ad01a194fe9840d89725ea229.tar.gz | |
Report errors from stream read and write operations
The php_stream_read() and php_stream_write() functions now return
an ssize_t value, with negative results indicating failure. Functions
like fread() and fwrite() will return false in that case.
As a special case, EWOULDBLOCK and EAGAIN on non-blocking streams
should not be regarded as error conditions, and be reported as
successful zero-length reads/writes instead. The handling of EINTR
remains unclear and is internally inconsistent (e.g. some code-paths
will automatically retry on EINTR, while some won't).
I'm landing this now to make sure the stream wrapper ops API changes
make it into 7.4 -- however, if the user-facing changes turn out to
be problematic we have the option of clamping negative returns to
zero in php_stream_read() and php_stream_write() to restore the
old behavior in a relatively non-intrusive manner.
Diffstat (limited to 'ext/bz2/tests')
| -rw-r--r-- | ext/bz2/tests/004.phpt | 8 | ||||
| -rw-r--r-- | ext/bz2/tests/bug72613.phpt | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ext/bz2/tests/004.phpt b/ext/bz2/tests/004.phpt index 8ddefe7404..2225433e0e 100644 --- a/ext/bz2/tests/004.phpt +++ b/ext/bz2/tests/004.phpt @@ -60,7 +60,7 @@ array(2) { } string(2) "OK" int(0) -string(0) "" +bool(false) array(2) { ["errno"]=> int(-5) @@ -69,7 +69,7 @@ array(2) { } string(16) "DATA_ERROR_MAGIC" int(-5) -string(0) "" +bool(false) array(2) { ["errno"]=> int(-4) @@ -78,7 +78,7 @@ array(2) { } string(10) "DATA_ERROR" int(-4) -string(0) "" +bool(false) array(2) { ["errno"]=> int(-5) @@ -87,7 +87,7 @@ array(2) { } string(16) "DATA_ERROR_MAGIC" int(-5) -string(0) "" +bool(false) array(2) { ["errno"]=> int(-4) diff --git a/ext/bz2/tests/bug72613.phpt b/ext/bz2/tests/bug72613.phpt index 049e065554..d9463e212a 100644 --- a/ext/bz2/tests/bug72613.phpt +++ b/ext/bz2/tests/bug72613.phpt @@ -20,4 +20,4 @@ bzclose($fp); ?> DONE --EXPECT-- -DONE +ERROR: bzread() |