summaryrefslogtreecommitdiff
path: root/ext/json
Commit message (Collapse)AuthorAgeFilesLines
* Happy New Year~Xinchen Hui2013-01-012-2/+2
|
* Revert change 3f3ad30c50: There shouldn't be new features in 5.3, especiallyjohannes2012-07-055-45/+25
| | | | not if they aren't in 5.4, too.
* Revert JSON changes to PHP 5.3Nikita Popov2012-07-0112-195/+46
| | | | | | | | | | This reverts the following commits: 974324676b2436f159f42d9241c569f813471684 4662151ea7d7b6920d115cf2a2d6e9d4232727a3 84fe2cc890e49f40bac7c3ba74b3cfc6dc4cef2f This does not revert the JSON changes released in PHP 5.3.14.
* Add json_last_error_msg() functionNikita Popov2012-06-288-42/+51
| | | | | This replaces json_last_error(true) and is consistent with other custom error handling functions.
* Improve JSON error handlingNikita Popov2012-06-278-49/+92
| | | | | | | | | 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.
* Improve json_encode error handlingNikita Popov2012-06-239-13/+110
| | | | | | | | | | | | | | | | | | | json_encode() now returns bool(false) for all possible errors, throws the respective warning and also sets the respective json_last_error() error code. Three new error codes have been added: * JSON_ERROR_RECURSION * JSON_ERROR_INF_OR_NAN * JSON_ERROR_UNSUPPORTED_TYPE To get a partial JSON output instead of bool(false) the option JSON_PARTIAL_OUTPUT_ON_ERROR can be specified. In this case the invalid segments will be replaced either by null (for recursion, unsupported type and invalid JSON) or 0 (for Inf and NaN). The warning for invalid UTF-8 stays intact and is thrown also with display_errors = On. If this behavior is undesired this can be remedied later.
* Fix bug #61537 (json_encode() incorrectly truncates/discards information) andAdam Harvey2012-04-115-25/+45
| | | | remove a test case that's now mooted by this fix.
* Adding Braces in json.c to conform with coding standardsMatt Nowack2012-03-201-1/+2
|
* - Year++Felipe Pena2012-01-012-2/+2
|
* Fixed bug #55543 (json_encode() with JSON_NUMERIC_CHECK fails on objects ↵Ilia Alshanetsky2011-10-172-1/+14
| | | | with numeric string properties)
* - Make usage of new PHP_FE_END macroFelipe Pena2011-07-251-1/+1
|
* Remove duplicate lines present in PHP_5_3's .phpt (dtajchreber)Christopher Jones2011-06-171-25/+0
|
* Fixed bug #54484 (Empty string in json_decode doesn't reset json_last_error()).Ilia Alshanetsky2011-06-012-0/+52
|
* Fix Bug #54058, invalid utf-8 doesn't set json_encode() in all casesScott MacVicar2011-02-212-1/+37
|
* Fix Bug #53963, error code isn't always set in certain error cases.Scott MacVicar2011-02-091-0/+2
|
* - Year++Felipe Pena2011-01-012-2/+2
|
* Fix English in the error message emitted when json_decode() is called withAdam Harvey2010-09-141-1/+1
| | | | | depth <= 0.
* Fix bug #52262 - Invalid UTF-8 documents don't set an error code when they ↵Scott MacVicar2010-07-061-0/+1
| | | | fail to decode.
* Added support for JSON_NUMERIC_CHECK option in json_encode() that converts Ilia Alshanetsky2010-05-203-13/+39
| | | | | | numeric strings to integers.
* - Fixed bug #51590 (JSON_ERROR_UTF8 is undefined)Felipe Pena2010-04-181-0/+1
|
* - Fixed testsFelipe Pena2010-04-032-8/+2
|
* sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.phpSebastian Bergmann2010-01-032-2/+2
|
* Fix broken json tests in all branchesRasmus Lerdorf2009-08-031-16/+8
|
* MFH: Add error constant when json_encode detects an invalid UTF-8 sequence.Scott MacVicar2009-07-272-0/+3
|
* fix tests corrupted by svn's eol-style=nativeAlexey Zakhlestin2009-07-152-32/+16
|
* fix json shared build on WindowsStanislav Malyshev2009-06-302-4/+10
|
* - MFH: Fixed memleak when depth arg is less than zeroFelipe Pena2009-06-241-0/+1
|
* The json header should be installed so other exts can use itJohannes Schlüter2009-06-231-0/+1
|
* New json extension tests. Tested on Windows, Linux and Linux 64 bit.andy wharmby2009-06-145-0/+450
|
* Fix the build.Andrei Zmievski2009-05-311-0/+1
|
* MFH: no dots in errorsJani Taskinen2009-05-311-3/+3
|
* Expose encode/decode API.Andrei Zmievski2009-05-312-43/+53
|
* Cast to unsigned char to prevent compiler warningKalle Sommer Nielsen2009-05-191-1/+1
|
* MFH: Fix arginfoKalle Sommer Nielsen2009-05-151-0/+1
|
* MFH Allow a custom recursion depth to be specified for json_decode()Scott MacVicar2009-05-143-7/+15
|
* Rebuild credits, was missed in previous RCScott MacVicar2009-04-021-1/+1
|
* MFH: Avoid 2 conversions when decoding numbersMatt Wilmas2009-03-191-6/+17
|
* MFH Missing skip in testsScott MacVicar2009-03-171-0/+2
|
* MFH Replace magic values with a define for json encoding, makes reading it a ↵Scott MacVicar2009-03-171-7/+10
| | | | bit easier
* MFH Add PHP_JSON_FORCE_OBJECT for forcing an object output of an arrayScott MacVicar2009-03-172-1/+13
|
* MFH Deal with overflow when decoding large numbersScott MacVicar2009-03-171-2/+3
|
* MFH Fix bug #47644 - Valid integers are truncated with json_decode()Scott MacVicar2009-03-172-4/+47
|
* Fix tests. Add missing SKIPIF. Tested on Windows, Linux and Linux 64andy wharmby2009-01-232-10/+16
|
* Fix test again...Scott MacVicar2009-01-081-2/+2
|
* Fix broken testScott MacVicar2009-01-081-1/+4
|
* MFH Fix bug #46944 - UTF-8 characters outside the BMP aren't encoded correctly.Scott MacVicar2009-01-023-2/+34
|
* MFH: Bump copyright year, 3 of 3.Sebastian Bergmann2008-12-312-2/+2
|
* MFH Make sure we clear out the error when the scalar version decoding works.Scott MacVicar2008-12-241-0/+6
|
* MFH Add json_last_error() for getting a bit of information about what failed ↵Scott MacVicar2008-12-195-28/+107
| | | | | | | during a decode, also fixes a segfault when we have [1} [DOC]
* MFH Fix Windows buildScott MacVicar2008-12-171-0/+3
|