]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 82c05ee 1461a40)
Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Thu, 12 Apr 2012 10:02:38 +0000 (12:02 +0200)
committerJohannes Schlüter <johannes@php.net>
Thu, 12 Apr 2012 10:02:38 +0000 (12:02 +0200)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.