mirror of
https://github.com/php/php-src.git
synced 2024-10-03 07:46:12 +00:00
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: Remove cherry-picked items for 5.3.11 Fix bug #61537 (json_encode() incorrectly truncates/discards information) and remove a test case that's now mooted by this fix. Conflicts: ext/json/json.c ext/json/php_json.h
This commit is contained in:
commit
0a580ac76f