]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Tue, 12 Jul 2016 04:18:09 +0000 (12:18 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 12 Jul 2016 04:18:09 +0000 (12:18 +0800)
commitf71fcf8bdd685eda621c5671f094ea7fdf2c36f4
tree612dffab0268790656ed3ea33b81d7600883ef40
parent42902919bc0f97977e116415c9968dc6b23b12d2
parent7903276f4c18fcfda06c02785f0b4201421f9c7c
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  backport to 5.6 (we should not unset the default value)

Conflicts:
Zend/zend_exceptions.c
ext/standard/tests/serialize/bug69152.phpt
ext/standard/tests/serialize/bug69152.phpt
ext/standard/tests/serialize/bug69793.phpt
ext/standard/tests/serialize/bug70963.phpt