Merge branch 'PHP-5.5' into PHP-5.6

smalyshev · smalyshev · commit 0f333fa93c63 · 2015-03-08T23:41:30.000-07:00
* PHP-5.5:
  added missing parentheses
  Fix #67626
  Fix #63486

Conflicts:
	main/streams/userspace.c
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -701,7 +701,7 @@ static size_t php_userstreamop_read(php_stream stream, char buf, size_t count`
`701`	`701`	`zval_ptr_dtor(&zcount);`
`702`	`702`
`703`	`703`	`if (EG(exception)) {`
`704`		`- return -1;`
	`704`	`+ return 0;`
`705`	`705`	`}`
`706`	`706`
`707`	`707`	`if (call_result == SUCCESS && retval != NULL) {`