summaryrefslogtreecommitdiff
path: root/ext/json/json.c
Commit message (Expand)AuthorAgeFilesLines
* Happy New YearXinchen Hui2013-01-011-1/+1
* Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2012-12-111-3/+28
|\
| * Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.Adam Harvey2012-12-111-3/+28
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2012-11-261-17/+22
|\ \ | |/
| * Related bug #63588 fix length computation + optimize for speedRemi Collet2012-11-261-17/+22
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2012-11-251-3/+29
|\ \ | |/
| * Fixed bug #63588 Duplicate implementation of php_next_utf8_charRemi Collet2012-11-251-3/+29
| * Revert JSON merges to 5.4Nikita Popov2012-07-011-54/+10
* | Fix test failed due to new feature introduced in 45d596eaXinchen Hui2012-07-291-1/+1
* | Add optional depth parameter to json_encode #62369Florian Anderiasch2012-07-241-1/+9
|/
* fix bug #61359: json_encode() calls too many reallocsStanislav Malyshev2012-06-301-9/+12
* Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-06-281-10/+19
|\
| * Add json_last_error_msg() functionNikita Popov2012-06-281-10/+19
* | Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-06-271-9/+33
|\ \ | |/
| * Improve JSON error handlingNikita Popov2012-06-271-8/+33
* | Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-06-231-7/+18
|\ \ | |/
| * Improve json_encode error handlingNikita Popov2012-06-231-4/+11
| * Fix bug #61537 (json_encode() incorrectly truncates/discards information) andAdam Harvey2012-04-111-4/+7
* | - Fixed bug #61978 (Object recursion not detected for classes that implement ...Felipe Pena2012-05-081-0/+13
* | Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards informat...Stanislav Malyshev2012-05-011-7/+4
* | Fix bug #61537 (json_encode() incorrectly truncates/discards information) andAdam Harvey2012-04-111-4/+7
* | Merge branch 'PHP-5.3' into PHP-5.4David Soria Parra2012-03-201-1/+2
|\ \ | |/
| * 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 with...Ilia Alshanetsky2011-10-171-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 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
| * Fix bug #52262 - Invalid UTF-8 documents don't set an error code when they fa...Scott MacVicar2010-07-061-0/+1
| * Added support for JSON_NUMERIC_CHECK option in json_encode() that converts Ilia Alshanetsky2010-05-201-11/+27
| * - 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 with...Ilia Alshanetsky2011-10-171-1/+1
* | Add unescaped Unicode encoding to json_encode(). Closes bug #53946. Patch by ...Gwynne Raskind2011-08-291-10/+15
* | - 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
* | 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
* | Fix bug #52262 - Invalid UTF-8 documents don't set an error code when they fa...Scott MacVicar2010-07-061-0/+1
* | Add JSON_BIGINT_AS_STRING for json_decode() to parse large numbersSara Golemon2010-05-211-4/+17
* | Added support for JSON_NUMERIC_CHECK option in json_encode() that converts Ilia Alshanetsky2010-05-201-11/+27
* | Rename JSON_Serializable to JsonSerializable per ML discussionSara Golemon2010-05-121-4/+3