delta/php-git.git/ext/json, branch php-5.4.17

Happy New Year

2013-01-01T08:28:54+00:00

Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.

2012-12-11T11:51:30+00:00

Fixes bug #63737 (json_decode does not properly decode with options parameter).

Related bug #63588 fix length computation + optimize for speed

2012-11-26T11:59:08+00:00

Following comment from Yoram "The patch looks fine, except of testing
for true value of utf16 in each iteration."
Also fix the length computation during check phase.

Fixed bug #63588 Duplicate implementation of php_next_utf8_char

2012-11-25T07:14:23+00:00

Json use an utf8 parser from a third party library, switch to
our implementation of php_next_utf8_char.
This also helps on solving #63520. All the unit tests succeed.
Our implementation also seems a little faster.

json.dsp need to be regenerated.

Revert JSON merges to 5.4

2012-07-01T14:38:26+00:00

This reverts the following merge commits (-m 1):

405ebfcd182a39f0960ff7d7055d49053d3e0316
d372b33c9b941be9a795bf3705bd22dc5f6092c3
36fa17a5fae84ab332366a202f0a709279a2466a

fix bug #61359: json_encode() calls too many reallocs

2012-07-01T02:14:30+00:00

Merge branch 'PHP-5.3' into PHP-5.4

2012-06-28T18:18:19+00:00

* PHP-5.3:
  Add json_last_error_msg() function

Add json_last_error_msg() function

2012-06-28T18:11:27+00:00

This replaces json_last_error(true) and is consistent with other custom
error handling functions.

Merge branch 'PHP-5.3' into PHP-5.4

2012-06-27T10:28:55+00:00

* PHP-5.3:
  Improve JSON error handling

Conflicts:
	ext/json/tests/bug54058.phpt
	ext/json/tests/bug61537.phpt

Improve JSON error handling

2012-06-27T10:21:48+00:00

json_encode() no longer throws warnings. Instead only the error code for
json_last_error() is set.

As it is hard to debug the error from just an error code an optional
$as_string parameter was added to json_last_error(), which returns an
error message instead of an error code.