]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85ccebc 65ae744)
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Mon, 21 Mar 2016 08:22:02 +0000 (16:22 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 21 Mar 2016 08:22:02 +0000 (16:22 +0800)
* PHP-7.0:
  Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)

1  2 
Zend/zend_builtin_functions.c patch | diff1 | diff2 | blob | history

diff --cc Zend/zend_builtin_functions.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.