com php-src: Merge branch 'PHP-5.6' into PHP-7.0: Zend/zend_v m_def.h Zend/zend_vm_execute.h ext/standard/var _unserializer.c
ext/standard/var_unserializer.re

From: Date: Thu, 17 Mar 2016 07:22:44 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: Zend/zend_v m_def.h Zend/zend_vm_execute.h ext/standard/var _unserializer.c
ext/standard/var_unserializer.re
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-91385@lists.php.net to get a copy of this message
Commit: fe1a3fc08bf47b8d484922d698975f134c7e9e3b Author: Xinchen Hui <laruence@gmail.com> Thu, 17 Mar 2016 15:22:44 +0800 Parents: fba1c7629c2aa4c09d3e4cd6219dd7034cc56305 5546f8be5605f94e174d8a4faee40e1ddec79a03 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fe1a3fc08bf47b8d484922d698975f134c7e9e3b Log: 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 Bugs: https://bugs.php.net/71841 https://bugs.php.net/71840 Changed paths: MM Zend/zend_vm_def.h MM Zend/zend_vm_execute.h MM ext/standard/var_unserializer.c MM ext/standard/var_unserializer.re Diff: <Diff exceeded maximum size>

« previous php.cvs (#91385) next »