diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-03-21 16:03:16 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-03-21 16:03:16 +0800 |
| commit | 65ae7440b026440835f6fdc5d19ea9e0fde41436 (patch) | |
| tree | d2ff55b0ebe81b4aefe5817be00f74452532dee4 /sapi/cli/php_cli.c | |
| parent | c4517b2a5e3141393c1c4f6fca51e1c325e91251 (diff) | |
| parent | 7e069daa89f05c1fa4127b2cedfd5586dbfc810e (diff) | |
| download | php-git-65ae7440b026440835f6fdc5d19ea9e0fde41436.tar.gz | |
Merge branch 'bug71835' of https://github.com/bukka/php-src into PHP-7.0
* 'bug71835' of https://github.com/bukka/php-src:
Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)
Diffstat (limited to 'sapi/cli/php_cli.c')
0 files changed, 0 insertions, 0 deletions