archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 22:48:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.5' into PHP-5.6

Browse source 
* PHP-5.5:
  added missing parentheses
  Fix #67626
  Fix #63486

Conflicts:
	main/streams/userspace.c
This commit is contained in:
Stanislav Malyshev 2015-03-08 23:41:30 -07:00
commit 0f333fa93c
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
main/streams/userspace.c
View file

@ -701,7 +701,7 @@ static size_t php_userstreamop_read(php_stream *stream, char *buf, size_t count
zval_ptr_dtor(&zcount); zval_ptr_dtor(&zcount);
if (EG(exception)) { if (EG(exception)) {
return -1; return 0;
} }
if (call_result == SUCCESS && retval != NULL) { if (call_result == SUCCESS && retval != NULL) {