From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 31 Aug 2016 11:27:23 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0RC1~3^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08a71df6127d499eabcf6088493a217fd9436f37;p=php

Merge branch 'PHP-5.6' into PHP-7.0
---

08a71df6127d499eabcf6088493a217fd9436f37
diff --cc ext/standard/file.c
index e228ce6121,f3b6df1274..5b051774c9
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@@ -1547,7 -1513,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 TSRMLS_CC, E_WARNING, "Negative size is not supported"); */
++		/* php_error_docref(NULL, E_WARNING, "Negative size is not supported"); */
  		RETURN_FALSE;
  	}