summaryrefslogtreecommitdiff
path: root/ext/json/json.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'PHP-5.3' into PHP-5.4David Soria Parra2012-03-201-1/+2
|\ \ | |/ | | | | | | * PHP-5.3: Adding Braces in json.c to conform with coding standards
| * 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
| |
* | - 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)
* | Add unescaped Unicode encoding to json_encode(). Closes bug #53946. Patch by ↵Gwynne Raskind2011-08-291-10/+15
| | | | | | | | Irker and Gwynne.
* | - Added missing PHP_FE_END/ZEND_FE_ENDFelipe Pena2011-08-061-1/+1
| |
* | - 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 method name in JsonSerializable exception messagePeter Cowburn2011-04-301-1/+1
| |
* | 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
| |
* | Implement FR #44331 (Formatting option for json_encode). Bikeshedding about theAdam Harvey2010-09-161-1/+46
| | | | | | | | | | | | exact form of the JSON pretty printing and brace handling will only be accepted in the form of patches. ;)
* | Rebalance the folds in json.c.Adam Harvey2010-09-161-1/+3
| |
* | Implemented FR #49366 (Make slash escaping optional in json_encode()).Adam Harvey2010-09-161-1/+6
| |
* | 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.
* | Add JSON_BIGINT_AS_STRING for json_decode() to parse large numbersSara Golemon2010-05-211-4/+17
| | | | | | | | | | as strings rather than casting to double and loosing precision.
* | Added support for JSON_NUMERIC_CHECK option in json_encode() that converts Ilia Alshanetsky2010-05-201-11/+27
| | | | | | | | | | | | numeric strings to integers.
* | Rename JSON_Serializable to JsonSerializable per ML discussionSara Golemon2010-05-121-4/+3
| |
* | Well we do need zend_throw_exception_ex ;-)Kalle Sommer Nielsen2010-05-061-0/+1
| |
* | Add JSON_Serializable interfaceSara Golemon2010-05-051-1/+57
| | | | | | | | | | | | | | | | Objects implementing JSON_Serializable will have their ->jsonSerialize() method called Similar to serialize() and __sleep()
* | - Fixed bug #51590 (JSON_ERROR_UTF8 is undefined)Felipe Pena2010-04-181-0/+1
| |
* | Remove main/php3_compat.h, for that a few references to `function_entry` haveJohannes Schlüter2010-03-301-1/+1
|/ | | | | to be replaced by `zend_function_entry`.
* 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
|