From d59aac58b3e7da7ad01a194fe9840d89725ea229 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 18 Jul 2019 15:25:59 +0200 Subject: 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. --- ext/pgsql/php_pgsql.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/pgsql/php_pgsql.h') diff --git a/ext/pgsql/php_pgsql.h b/ext/pgsql/php_pgsql.h index 0294ea10a9..cecd2cc95b 100644 --- a/ext/pgsql/php_pgsql.h +++ b/ext/pgsql/php_pgsql.h @@ -225,8 +225,8 @@ static void php_pgsql_get_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_typ static void php_pgsql_data_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type); static void php_pgsql_do_async(INTERNAL_FUNCTION_PARAMETERS,int entry_type); -static size_t php_pgsql_fd_write(php_stream *stream, const char *buf, size_t count); -static size_t php_pgsql_fd_read(php_stream *stream, char *buf, size_t count); +static ssize_t php_pgsql_fd_write(php_stream *stream, const char *buf, size_t count); +static ssize_t php_pgsql_fd_read(php_stream *stream, char *buf, size_t count); static int php_pgsql_fd_close(php_stream *stream, int close_handle); static int php_pgsql_fd_flush(php_stream *stream); static int php_pgsql_fd_set_option(php_stream *stream, int option, int value, void *ptrparam); -- cgit v1.2.1