delta/php-git.git/ext/json, branch immutable-date git.php.net: repository/php-src.git Happy New Year 2013-01-01T08:37:09+00:00 Xinchen Hui laruence@php.net 2013-01-01T08:37:09+00:00 a666285bc2488b7f7362368c388e41428610ad1d 






Merge branch 'PHP-5.4' into PHP-5.5
2012-12-11T11:53:02+00:00

Adam Harvey
aharvey@php.net

2012-12-11T11:53:02+00:00

8bb106d20c8f36d814772c45d693af2b42b06732

* PHP-5.4:
  Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.





* PHP-5.4:
  Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.







Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.
2012-12-11T11:51:30+00:00

Adam Harvey
aharvey@php.net

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

2d1694d4ebd51ab61f12e6bc545a17e3baf3b4a0

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





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







Merge branch 'PHP-5.4' into PHP-5.5
2012-11-26T12:05:37+00:00

Remi Collet
remi@php.net

2012-11-26T12:05:37+00:00

495ff0964d6c24f04f1d705334bb3a5ce49ea8cb

* PHP-5.4:
  Related bug #63588 fix length computation + optimize for speed





* PHP-5.4:
  Related bug #63588 fix length computation + optimize for speed







Related bug #63588 fix length computation + optimize for speed
2012-11-26T11:59:08+00:00

Remi Collet
remi@php.net

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

7751a6882485de64365661f4e7918535c3992982

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.





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.







Merge branch 'PHP-5.4' into PHP-5.5
2012-11-25T07:21:10+00:00

Remi Collet
remi@php.net

2012-11-25T07:21:10+00:00

f4a8612561b5b446d563901a3f13edf9e6298267

* PHP-5.4:
  Fixed bug #63588 Duplicate implementation of php_next_utf8_char





* PHP-5.4:
  Fixed bug #63588 Duplicate implementation of php_next_utf8_char







Fixed bug #63588 Duplicate implementation of php_next_utf8_char
2012-11-25T07:14:23+00:00

Remi Collet
remi@php.net

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

289bb339c9e722ff3017ec58fdef7300f39b8e6d

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.





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.







Fix 64bit JSON test
2012-08-13T16:43:03+00:00

Nikita Popov
nikic@saturn.(none)

2012-08-13T16:42:16+00:00

f3192ea6e4405dded21cc81a6587374b019a6173












Fix test failed due to new feature introduced in 45d596ea
2012-07-29T15:35:06+00:00

Xinchen Hui
laruence@php.net

2012-07-29T15:35:06+00:00

f8559194db82a231bbed547bd15f077e343914e4












Add optional depth parameter to json_encode #62369
2012-07-24T11:15:16+00:00

Florian Anderiasch
fa@php.net

2012-07-24T11:15:16+00:00

45d596ea1e32792c7b7b7f28be220dea861b6708