diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-22 17:25:28 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-22 17:26:01 +0200 |
| commit | a1e2c8870ebfdc1c2d9fa25327bc3dad5bd68c91 (patch) | |
| tree | 1ba6ec4f9b3f51ef407c2903af2ad7815f8b69ca /ext/curl | |
| parent | 7a1540fa2872a67080f2161faff226c1effebf76 (diff) | |
| parent | d59aac58b3e7da7ad01a194fe9840d89725ea229 (diff) | |
| download | php-git-a1e2c8870ebfdc1c2d9fa25327bc3dad5bd68c91.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'ext/curl')
| -rw-r--r-- | ext/curl/interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 6b42ddafa6..6a25359597 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -2133,9 +2133,9 @@ PHP_FUNCTION(curl_copy_handle) static size_t read_cb(char *buffer, size_t size, size_t nitems, void *arg) /* {{{ */ { php_stream *stream = (php_stream *) arg; - size_t numread = php_stream_read(stream, buffer, nitems * size); + ssize_t numread = php_stream_read(stream, buffer, nitems * size); - if (numread == (size_t)-1) { + if (numread < 0) { return CURL_READFUNC_ABORT; } return numread; |