summaryrefslogtreecommitdiff
path: root/ext/json/json.c
Commit message (Expand)AuthorAgeFilesLines
* Use reference counting instead of zval duplicationDmitry Stogov2014-06-051-1/+1
* Introduced immutable arrays. They don't need to be copyed and may be used dir...Dmitry Stogov2014-05-291-2/+2
* Fixed Reference handling in xml_parse_into_structXinchen Hui2014-05-051-3/+0
* Port JSONNikita Popov2014-05-051-114/+97
* Merge branch 'PHP-5.6'Stanislav Malyshev2014-04-131-8/+10
|\
| * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-131-8/+10
| |\
| | * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-131-8/+10
| | |\
| | | * Merge branch 'pull-request/518' into PHP-5.4Stanislav Malyshev2014-04-131-8/+10
| | | |\
| | | | * Fix #66021 (Blank line inside empty array/object)Kevin Israel2013-11-021-8/+10
| | * | | Merge branch 'PHP-5.4' into PHP-5.5Julien Pauli2014-02-171-1/+1
| | |\ \ \ | | | |/ /
| | | * | Export JsonSerializable Interface (bug #65753)Julien Pauli2014-02-171-1/+1
| | | * | Bump yearXinchen Hui2014-01-031-1/+1
| | * | | Bump yearXinchen Hui2014-01-031-1/+1
| * | | | Export JsonSerializable Interface (bug #65753)Julien Pauli2014-02-171-1/+1
* | | | | Export JsonSerializable Interface (bug #65753)Julien Pauli2014-02-171-1/+1
* | | | | Merge branch 'PHP-5.6'Xinchen Hui2014-01-031-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Bump yearXinchen Hui2014-01-031-1/+1
* | | | | Merge branch 'PHP-5.6'kovacs.ferenc2013-11-181-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Fixed case part of bug #64874 ("json_decode handles whitespace and case-sensi...Andrea Faulds2013-11-111-3/+3
| |/ / /
* | | | Merge branch 'PHP-5.6'Adam Harvey2013-11-101-8/+22
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2013-11-101-8/+22
| |\ \ \ | | |/ /
| | * | Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case...Andrea Faulds2013-09-171-8/+22
| | |/
| | * Happy New YearXinchen Hui2013-01-011-1/+1
* | | Make all code paths in json_determine_array_type() return constants.Adam Harvey2013-11-091-2/+2
|/ /
* | HASH_KEY_NON_EXISTANT fixVeres Lajos2013-07-211-2/+2
* | 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