diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-03-08 23:41:30 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-03-08 23:41:30 -0700 |
| commit | 0f333fa93c63f70d06b5aa8c65b6bf23057b1b58 (patch) | |
| tree | af45efe997ff7e006a1f63765341a049f47a46f1 | |
| parent | 934d6ed900f3d9dbb94e8d428fd60cf2360d80d4 (diff) | |
| parent | fa72f1ea869e23fd92c50f69a8350e50d57e1c12 (diff) | |
| download | php-git-0f333fa93c63f70d06b5aa8c65b6bf23057b1b58.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
added missing parentheses
Fix #67626
Fix #63486
Conflicts:
main/streams/userspace.c
| -rw-r--r-- | main/streams/userspace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/streams/userspace.c b/main/streams/userspace.c index e4a2663036..38a5dd3107 100644 --- a/main/streams/userspace.c +++ b/main/streams/userspace.c @@ -701,7 +701,7 @@ static size_t php_userstreamop_read(php_stream *stream, char *buf, size_t count zval_ptr_dtor(&zcount); if (EG(exception)) { - return -1; + return 0; } if (call_result == SUCCESS && retval != NULL) { |