Tyson Andre [Sun, 20 Nov 2016 23:18:32 +0000 (15:18 -0800)]
Fix memory leak(null coalescing operator with Spl hash)
The SEPARATE_ARG_IF_REF macro increased the refcount of the object passed as a
key.
However, when the key did not exist in the ArrayAccess implementation,
the code returned early without trying to decrement the refcount.
Add a test of `??` succeeding+failing on a SplObjectStorage instance.
Mitch Hagstrand [Fri, 11 Nov 2016 23:40:30 +0000 (15:40 -0800)]
Fix the lchwon error test for Travis CI.
The E_WARNING message from the PHP function lchown is passed
from the system function lchown. The error message returned
from lchown can be filesystem dependent.
Dmitry Stogov [Thu, 17 Nov 2016 12:58:38 +0000 (15:58 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed test
Updated NEWS
Improvement for bug73297
Simplify ext/standard/tests/http/bug73297.phpt
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
Add failing test for bug#73297
Dmitry Stogov [Thu, 17 Nov 2016 11:07:11 +0000 (14:07 +0300)]
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:php-src:
Updated NEWS
Improvement for bug73297
Simplify ext/standard/tests/http/bug73297.phpt
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
Add failing test for bug#73297
Fix #73530: Unsetting result set may reset other result set
Calling sqlite3_reset() when a result set object is freed can cause
undesired and maybe even hard to track interference with other result
sets. Furthermore, there is no need to call sqlite3_reset(), because
that is implicitly called on SQLite3Stmt::execute(), and users are
encouraged to explicitly call either SQLite3Result::finalize() or
SQLite3Stmt::reset() anyway.
Anatol Belski [Tue, 8 Nov 2016 10:13:29 +0000 (11:13 +0100)]
Merge remote-tracking branch 'phpsec/PHP-7.0.13' into PHP-7.0
* phpsec/PHP-7.0.13:
Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash
Fix #72696: imagefilltoborder stackoverflow on truecolor images
Fix #72482: Ilegal write/read access caused by gdImageAALine overflow
Fix bug #73144 and bug #73341 - remove extra dtor
remove unreferenced var came in with merge
Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
fix version
set versions
Anatol Belski [Tue, 8 Nov 2016 10:11:22 +0000 (11:11 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash
Fix #72696: imagefilltoborder stackoverflow on truecolor images
Fix #72482: Ilegal write/read access caused by gdImageAALine overflow
Fix bug #73144 and bug #73341 - remove extra dtor
Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
Anatol Belski [Tue, 8 Nov 2016 01:26:43 +0000 (02:26 +0100)]
Enable FTS4 and FTS5 for bundled libsqlite
FTS3 is already enabled by default, and the other FTS versions
seems just to have been missed. Given that, the other FTS plugins
look like a low impact so worth a try. The current bundled libsqlite
versions in 7.x are proven stable already and support FTS5.
Anatol Belski [Sun, 6 Nov 2016 16:51:25 +0000 (17:51 +0100)]
add missing RETURN_STRINGL_CHECK
As RETVAL_STRINGL_CHECK is already there, this one is needed for
completion. One place in ext/bz2 is missing that, so it will likely
be useful for other possible fixes.