com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/standard/file.c
| From: | Christoph Michael Becker | Date: | Wed, 31 Aug 2016 12:53:53 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/standard/file.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94198@lists.php.net to get a copy of this message | ||
Commit: 8f32d609c586fdaab200d50377eb8b2e2667d2d2
Author: Christoph M. Becker <cmbecker69@gmx.de> Wed, 31 Aug 2016 14:53:53 +0200
Parents: 97f2bb894a779d1dbb67c5f0582ad98808f81176 314a9f8553625eec8f5cfc60360790533d786bc5
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8f32d609c586fdaab200d50377eb8b2e2667d2d2
Log:
Merge branch 'PHP-5.6' into PHP-7.0
Changed paths:
MM ext/standard/file.c
Diff:
diff --cc ext/standard/file.c
index e228ce6,f3b6df1..5b05177
--- 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;
}