com php-src: Merge branch 'master' into PHP-7.0.0: configure.in
| From: | Anatol Belski | Date: | Wed, 02 Sep 2015 20:08:24 +0000 |
| Subject: | com php-src: Merge branch 'master' into PHP-7.0.0: configure.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88896@lists.php.net to get a copy of this message | ||
Commit: 6ef7c6358fc37579d329268cbb56ab730bed2159
Author: Anatol Belski <ab@php.net> Wed, 2 Sep 2015 22:08:24 +0200
Parents: b7e910e9696001ae6fa728c10362f657b4b97742 fcece2a7bb0ecf1af1034a737bf5686a354e01d7
Branches: PHP-7.0.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6ef7c6358fc37579d329268cbb56ab730bed2159
Log:
Merge branch 'master' into PHP-7.0.0
* master: (201 commits)
sync NEWS
Add missing variable from birdstep_commit() which got removed in e8fcd52ef
Align NEWS entries format
Add CVE for #70140 (PHP 7.0.0 Beta 3)
Seems master is not affected
We should keep one refcount to resource
Fixed bug #70398 (SIGSEGV, Segmentation fault zend_ast_destroy_ex)
Fixed test
Partially fix bug #67167 - Wrong return value...
move the phpdbg NEWS entry to the correct version
add missing news entries
Skip if ext/filter isn't loaded
Merge branch 'PHP-5.6'
5.5.30 next
Use ZSTR_VAL
fix dir separators in test
use correct api
fix leak
cleanup an atavism
add overflow check
...
Bugs:
https://bugs.php.net/70140
https://bugs.php.net/70398
https://bugs.php.net/67167
Changed paths:
MM configure.in
Diff: