]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Thu, 17 Mar 2016 07:22:44 +0000 (15:22 +0800)
committerXinchen Hui <laruence@gmail.com>
Thu, 17 Mar 2016 07:22:44 +0000 (15:22 +0800)
commitfe1a3fc08bf47b8d484922d698975f134c7e9e3b
treebf6be9f193c7e9882ffdcd4c68d8e1f786d7a7c1
parentfba1c7629c2aa4c09d3e4cd6219dd7034cc56305
parent5546f8be5605f94e174d8a4faee40e1ddec79a03
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed bug #71841 (EG(error_zval) is not handled well)
  Fixed bug #71840 (Unserialize accepts wrongly data)

Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/standard/var_unserializer.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re