]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0.9' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Tue, 19 Jul 2016 08:08:18 +0000 (01:08 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 19 Jul 2016 08:08:18 +0000 (01:08 -0700)
* PHP-7.0.9:
  Partial fix for bug #72613 - do not allow reading past error read
  update NEWS
  Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders
  Fix bug #72551 and bug #72552 - check before converting size_t->int
  Fix bug #72541 - size_t overflow lead to heap corruption
  fix possible optimization bug
  set versions

Conflicts:
configure.in
ext/pdo_pgsql/tests/bug72570.phpt
main/php_version.h


Trivial merge