Nikita Popov
|
b7903f9778
|
Revert JSON merges to 5.4
This reverts the following merge commits (-m 1):
405ebfcd18
d372b33c9b
36fa17a5fa
|
2012-07-01 16:38:26 +02:00 |
|
Nikita Popov
|
d372b33c9b
|
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Improve JSON error handling
Conflicts:
ext/json/tests/bug54058.phpt
ext/json/tests/bug61537.phpt
|
2012-06-27 12:28:55 +02:00 |
|
Nikita Popov
|
36fa17a5fa
|
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Improve json_encode error handling
- BFN
Conflicts:
ext/json/json.c
|
2012-06-23 21:14:45 +02:00 |
|
Stanislav Malyshev
|
7bbd5521d2
|
Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards information) and"
This reverts commit cb2a1c71c9.
The fix is not correct, not fixed after discussion on github.
Please fix the issues and reapply the patch
|
2012-05-01 23:54:10 -07:00 |
|
Adam Harvey
|
cb2a1c71c9
|
Fix bug #61537 (json_encode() incorrectly truncates/discards information) and
remove a test case that's now mooted by this fix.
|
2012-04-11 08:29:39 +08:00 |
|
Adam Harvey
|
3f3ad30c50
|
Fix bug #61537 (json_encode() incorrectly truncates/discards information) and
remove a test case that's now mooted by this fix.
|
2012-04-11 08:24:38 +08:00 |
|
Stanislav Malyshev
|
b4443f35ff
|
fix #43941: invalid utf-8 not accepted
|
2008-01-30 03:17:57 +00:00 |
|