summaryrefslogtreecommitdiff
path: root/ext/json/json.c
Commit message (Collapse)AuthorAgeFilesLines
* Happy New Year~Xinchen Hui2013-01-011-1/+1
|
* Revert change 3f3ad30c50: There shouldn't be new features in 5.3, especiallyjohannes2012-07-051-7/+4
| | | | not if they aren't in 5.4, too.
* Revert JSON changes to PHP 5.3Nikita Popov2012-07-011-48/+7
| | | | | | | | | | 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-281-10/+19
| | | | | This replaces json_last_error(true) and is consistent with other custom error handling functions.
* Improve JSON error handlingNikita Popov2012-06-271-8/+33
| | | | | | | | | 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-231-4/+11
| | | | | | | | | | | | | | | | | | | 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-111-4/+7
| | | | 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-011-1/+1
|
* Fixed bug #55543 (json_encode() with JSON_NUMERIC_CHECK fails on objects ↵Ilia Alshanetsky2011-10-171-1/+1
| | | | with numeric string properties)
* - Make usage of new PHP_FE_END macroFelipe Pena2011-07-251-1/+1
|
* Fixed bug #54484 (Empty string in json_decode doesn't reset json_last_error()).Ilia Alshanetsky2011-06-011-0/+2
|
* Fix Bug #54058, invalid utf-8 doesn't set json_encode() in all casesScott MacVicar2011-02-211-1/+2
|
* - Year++Felipe Pena2011-01-011-1/+1
|
* 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-201-11/+27
| | | | | | numeric strings to integers.
* - Fixed bug #51590 (JSON_ERROR_UTF8 is undefined)Felipe Pena2010-04-181-0/+1
|
* sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.phpSebastian Bergmann2010-01-031-1/+1
|
* MFH: Add error constant when json_encode detects an invalid UTF-8 sequence.Scott MacVicar2009-07-271-0/+2
|
* fix json shared build on WindowsStanislav Malyshev2009-06-301-2/+2
|
* - MFH: Fixed memleak when depth arg is less than zeroFelipe Pena2009-06-241-0/+1
|
* MFH: no dots in errorsJani Taskinen2009-05-311-3/+3
|
* Expose encode/decode API.Andrei Zmievski2009-05-311-43/+50
|
* MFH: Fix arginfoKalle Sommer Nielsen2009-05-151-0/+1
|
* MFH Allow a custom recursion depth to be specified for json_decode()Scott MacVicar2009-05-141-4/+4
|
* 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-171-1/+3
|
* MFH: Bump copyright year, 3 of 3.Sebastian Bergmann2008-12-311-1/+1
|
* 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-191-9/+40
| | | | | | | during a decode, also fixes a segfault when we have [1} [DOC]
* Update the JSON parser with that on json.org, biggest change here is code ↵Scott MacVicar2008-12-171-16/+25
| | | | | | | | | readability. Less magic numbers in the state table. Add missing reflection information to json_encode() Fixes bug #45791 with 0e0 not being supported as a value Error values are stored when encountered during parsing
* MFH Fix bug #45989 - json_decode() doesn't return NULL on certain invalid ↵Scott MacVicar2008-12-121-7/+1
| | | | strings
* - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macroFelipe Pena2008-11-171-2/+0
|
* - Revert ZEND_BEGIN_ARG_INFO changeFelipe Pena2008-11-021-0/+2
|
* - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macroFelipe Pena2008-10-241-2/+0
|
* - MFH: Fixed bug #46215 (json_encode mutates its parameter and has some ↵Felipe Pena2008-10-021-0/+3
| | | | class-specific state)
* ws + csJani Taskinen2008-07-221-418/+392
|
* - Added arginfoFelipe Pena2008-06-271-2/+15
|
* ZTS fixDmitry Stogov2008-01-301-4/+4
|
* fix #43941: invalid utf-8 not acceptedStanislav Malyshev2008-01-301-2/+8
|
* MFH: Bump copyright year, 2 of 2.Sebastian Bergmann2007-12-311-1/+1
|
* MFH (json.c r-1.32) Add support for encoding optionsSara Golemon2007-12-171-15/+74
|
* Fixed bug #42785 (json_encode() formats doubles according to locale ratherIlia Alshanetsky2007-10-011-1/+1
| | | | | then following standard syntax).
* Improved memory usage by movig constants to read only memory. (Dmitry, Pierre)Dmitry Stogov2007-09-271-1/+1
|
* MFH: Fixed bug#42090 (json_decode causes segmentation fault)Hannes Magnusson2007-07-241-1/+1
|
* fix ws/foldingAntony Dovgal2007-07-231-4/+10
|
* Fixed bug #41673 (json_encode breaks large numbers in arrays).Ilia Alshanetsky2007-06-131-11/+3
|
* Fixed bug #41567 (json_encode() double conversion is inconsistent with PHP).Ilia Alshanetsky2007-06-041-1/+1
|
* MFH: protos (patch by jeffg at activestate dot com)Hannes Magnusson2007-05-251-0/+6
|
View Lorry Controller Status