]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorStanislav Malyshev <stas@php.net>
Sat, 5 Nov 2016 20:59:35 +0000 (13:59 -0700)
committerStanislav Malyshev <stas@php.net>
Sat, 5 Nov 2016 20:59:35 +0000 (13:59 -0700)
* PHP-7.0:
  More int->size_t and string overflow fixes

1  2 
Zend/zend_strtod.c
ext/bz2/bz2.c
ext/pgsql/pgsql.c
ext/spl/spl_directory.c
ext/standard/html.c
ext/standard/math.c

Simple merge
diff --cc ext/bz2/bz2.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge