com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_i ni_scanner.c Zend/zend_ini_scanner_defs.h Zend/ zend_language_scanner.c
Zend/zend_language_scanner _defs.h ext/gmp/gmp.c
| From: | Pierre Joye | Date: | Mon, 10 Mar 2014 11:18:57 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_i ni_scanner.c Zend/zend_ini_scanner_defs.h Zend/ zend_language_scanner.c Zend/zend_language_scanner _defs.h ext/gmp/gmp.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76410@lists.php.net to get a copy of this message | ||
Commit: eef2978afc24c233df5c6d1260f023fa64328c88
Author: Pierre Joye <pierre.php@gmail.com> Mon, 10 Mar 2014 12:18:57 +0100
Parents: ba79c45174aa70597e52ff85744927c4d1108e83 cf7e73cf26b1b3959316ca23fbe87e45532a7297
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=eef2978afc24c233df5c6d1260f023fa64328c88
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update NEWS
fix #66872, invalid argument crashes gmp_testbit
fix #66872, invalid argument crashes gmp_testbit
add vc12 (2013)
Conflicts:
ext/gmp/gmp.c
Bugs:
https://bugs.php.net/66872
Changed paths:
MM Zend/zend_ini_scanner.c
MM Zend/zend_ini_scanner_defs.h
MM Zend/zend_language_scanner.c
MM Zend/zend_language_scanner_defs.h
MM ext/gmp/gmp.c
Diff: <Diff exceeded maximum size>