Merge branch 'PHP-5.6' into PHP-7.0

cmb69 · cmb69 · commit 8f32d609c586 · 2016-08-31T14:53:53.000+02:00
diff --git a/ext/standard/file.c b/ext/standard/file.c
@@ -1547,7 +1547,7 @@ PHP_NAMED_FUNCTION(php_if_ftruncate)
 	}
 
 	if (size < 0) {
-		php_error_docref(NULL, E_WARNING, "Negative size is not supported");
+		/* php_error_docref(NULL, E_WARNING, "Negative size is not supported"); */
 		RETURN_FALSE;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1547,7 +1547,7 @@ PHP_NAMED_FUNCTION(php_if_ftruncate)`
`1547`	`1547`	`}`
`1548`	`1548`
`1549`	`1549`	`if (size < 0) {`
`1550`		`- php_error_docref(NULL, E_WARNING, "Negative size is not supported");`
	`1550`	`+ /* php_error_docref(NULL, E_WARNING, "Negative size is not supported"); */`
`1551`	`1551`	`RETURN_FALSE;`
`1552`	`1552`	`}`
`1553`	`1553`