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/standard/tests/streams | |
| 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/standard/tests/streams')
| -rw-r--r-- | ext/standard/tests/streams/bug44818.phpt | 4 | ||||
| -rw-r--r-- | ext/standard/tests/streams/eagain_is_not_an_error.phpt | 16 | ||||
| -rw-r--r-- | ext/standard/tests/streams/nonblocking_stdin.phpt | 11 |
3 files changed, 29 insertions, 2 deletions
diff --git a/ext/standard/tests/streams/bug44818.phpt b/ext/standard/tests/streams/bug44818.phpt index 7bd9fe5168..0446dfd3be 100644 --- a/ext/standard/tests/streams/bug44818.phpt +++ b/ext/standard/tests/streams/bug44818.phpt @@ -17,7 +17,7 @@ test("php://temp","w"); --EXPECTF-- php://memory, r resource(%d) of type (stream) -int(0) +bool(false) int(0) string(0) "" php://memory, r+ @@ -27,7 +27,7 @@ int(0) string(3) "foo" php://temp, r resource(%d) of type (stream) -int(0) +bool(false) int(0) string(0) "" php://temp, w diff --git a/ext/standard/tests/streams/eagain_is_not_an_error.phpt b/ext/standard/tests/streams/eagain_is_not_an_error.phpt new file mode 100644 index 0000000000..7bc50dc9b7 --- /dev/null +++ b/ext/standard/tests/streams/eagain_is_not_an_error.phpt @@ -0,0 +1,16 @@ +--TEST-- +EAGAIN/EWOULDBLOCK on a non-blocking socket should not result in an error return value +--SKIPIF-- +<?php +if (substr(PHP_OS, 0, 3) == 'WIN') die('skip not for Windows'); +?> +--FILE-- +<?php + +$sockets = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, STREAM_IPPROTO_IP); +stream_set_blocking($sockets[0], false); +var_dump(fread($sockets[0], 100)); + +?> +--EXPECT-- +string(0) "" diff --git a/ext/standard/tests/streams/nonblocking_stdin.phpt b/ext/standard/tests/streams/nonblocking_stdin.phpt new file mode 100644 index 0000000000..0e22190fb7 --- /dev/null +++ b/ext/standard/tests/streams/nonblocking_stdin.phpt @@ -0,0 +1,11 @@ +--TEST-- +Read from non-blocking stdio stream should not error +--FILE-- +<?php + +stream_set_blocking(STDIN, false); +var_dump(fread(STDIN, 1)); + +?> +--EXPECT-- +string(0) "" |