[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/standard/file.c
From:       Christoph Michael Becker <cmb () php ! net>
Date:       2016-08-31 11:27:23
Message-ID: php-mail-58f02a5c063b188915d7c10950081e261464632462 () git ! php ! net
[Download RAW message or body]

Commit:    08a71df6127d499eabcf6088493a217fd9436f37
Author:    Christoph M. Becker <cmbecker69@gmx.de>         Wed, 31 Aug 2016 13:27:23 +0200
Parents:   3317287ce125a33eb9d35501e59ad8330215f100 f215fb874ff30cf9be6322210c58021e75a7c393
Branches:  PHP-7.1 master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=08a71df6127d499eabcf6088493a217fd9436f37

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;
  	}


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]