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.
Xinchen Hui [Wed, 16 Nov 2016 07:14:33 +0000 (15:14 +0800)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
new entry for #2196
Improve error message
Fix test
Refactor and cleanup implementation.
Revert "Fix Bug #73461"
Revert "Protect class based session save handler"
Protect class based session save handler
Fix Bug #73461
Anatol Belski [Wed, 9 Nov 2016 10:28:50 +0000 (11:28 +0100)]
improve lib name guessing for newer libtidy
FreeBSD calls it tidy5. Still, the check is not perfect, as both
old and new lib can coexist. ATM, the preference is to pick up the
old lib, still. In it's absense the new one will be looked up.
Anatol Belski [Tue, 8 Nov 2016 10:15:06 +0000 (11:15 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash
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 #72696: imagefilltoborder stackoverflow on truecolor images
Fix #72482: Ilegal write/read access caused by gdImageAALine overflow
fix version
set versions
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 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.
projects / php / log