]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorStanislav Malyshev <stas@php.net>
Tue, 3 Jan 2017 05:37:06 +0000 (21:37 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 3 Jan 2017 05:37:06 +0000 (21:37 -0800)
commitca72faa2c50b249715597bbee51fcd01718a0494
tree2a9c96120ea56b07eff9942f96cb3f0bbe980e2a
parent2075fb2b73c2d56c7acfb29773a2dc68b8d2f29d
parenta6cdefe04353faf96f8a91fd8ef49f486bda7a7c
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix #73832 - leave the table in a safe state if the size is too big.
  Fix bug #73831 - NULL Pointer Dereference while unserialize php object
Zend/zend_hash.c
ext/wddx/wddx.c