com php-src: Merge branch 'PHP-7.0': Zend/zend_builtin_func tions.c
| From: | Xinchen Hui | Date: | Mon, 21 Mar 2016 08:22:02 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0': Zend/zend_builtin_func tions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91435@lists.php.net to get a copy of this message | ||
Commit: 1e5ac8940a68188413d9e49cdffd267a05a35c28
Author: Xinchen Hui <laruence@gmail.com> Mon, 21 Mar 2016 16:22:02 +0800
Parents: 85ccebc1c21d57fb996b08d5a1ceda26ad86b010 65ae7440b026440835f6fdc5d19ea9e0fde41436
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1e5ac8940a68188413d9e49cdffd267a05a35c28
Log:
Merge branch 'PHP-7.0'
* PHP-7.0:
Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)
Bugs:
https://bugs.php.net/71835
Changed paths:
MM Zend/zend_builtin_functions.c
Diff: