Merge branch 'PHP-5.3' into PHP-5.4

Browse Source

* 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:

Johannes Schlüter 2012-04-12 12:02:38 +02:00

parent 82c05eeda9 1461a40301

commit 0a580ac76f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available