summaryrefslogtreecommitdiff
path: root/ext/json
Commit message (Expand)AuthorAgeFilesLines
* fix signatureAnatol Belski2014-08-272-2/+2
* fix signatureAnatol Belski2014-08-271-1/+1
* 's' works with size_t round 3Anatol Belski2014-08-271-1/+1
* first show to make 's' work with size_tAnatol Belski2014-08-271-2/+2
* Improved performance of json_encode()Dmitry Stogov2014-08-271-29/+42
* fix strtol callAnatol Belski2014-08-261-1/+1
* master renames phase 1Anatol Belski2014-08-253-54/+54
* ported ext/jsonAnatol Belski2014-08-193-15/+15
* basic macro replacements, all at onceAnatol Belski2014-08-192-40/+40
* Merge branch 'PHP-5.6'Lior Kaplan2014-08-171-1/+1
|\
| * Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2014-08-171-1/+1
| |\
| | * Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-08-171-1/+1
| | |\
| | | * typofixesVeres Lajos2014-08-171-1/+1
* | | | 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
* | | | Fix length reset in JSON parserNikita Popov2014-05-291-1/+1
* | | | Fix ZTSNikita Popov2014-05-051-4/+4
* | | | Fixed Reference handling in xml_parse_into_structXinchen Hui2014-05-051-3/+0
* | | | Port JSONNikita Popov2014-05-054-202/+181
* | | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-04-132-8/+30
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-132-8/+30
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-132-8/+30
| | |\ \ | | | |/
| | | * Merge branch 'pull-request/518' into PHP-5.4Stanislav Malyshev2014-04-132-8/+30
| | | |\
| | | | * Fix #66021 (Blank line inside empty array/object)Kevin Israel2013-11-022-8/+30
| | * | | Merge branch 'PHP-5.4' into PHP-5.5Julien Pauli2014-02-172-2/+2
| | |\ \ \ | | | |/ /
| | | * | Export JsonSerializable Interface (bug #65753)Julien Pauli2014-02-172-2/+2
| | | * | Bump yearXinchen Hui2014-01-032-2/+2
| | * | | Bump yearXinchen Hui2014-01-032-2/+2
| * | | | Export JsonSerializable Interface (bug #65753)Julien Pauli2014-02-172-2/+2
* | | | | Export JsonSerializable Interface (bug #65753)Julien Pauli2014-02-172-2/+2
* | | | | Merge branch 'PHP-5.6'Xinchen Hui2014-01-032-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Bump yearXinchen Hui2014-01-032-2/+2
* | | | | Merge branch 'PHP-5.6'kovacs.ferenc2013-11-182-3/+72
|\ \ \ \ \ | |/ / / /
| * | | | Fixed case part of bug #64874 ("json_decode handles whitespace and case-sensi...Andrea Faulds2013-11-112-3/+72
| |/ / /
* | | | Merge branch 'PHP-5.6'Adam Harvey2013-11-102-8/+139
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2013-11-102-8/+139
| |\ \ \ | | |/ /
| | * | Better test: Check combined leading/trailingAndrea Faulds2013-10-151-0/+66
| | * | Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case...Andrea Faulds2013-09-172-8/+73
| | |/
| | * Happy New YearXinchen Hui2013-01-012-2/+2
* | | 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-012-2/+2
* | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2012-12-112-3/+60
|\ \ | |/
| * Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.Adam Harvey2012-12-112-3/+60
* | 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-255-67/+31
|\ \ | |/
| * Fixed bug #63588 Duplicate implementation of php_next_utf8_charRemi Collet2012-11-255-67/+31
| * Revert JSON merges to 5.4Nikita Popov2012-07-0116-232/+47
* | Fix 64bit JSON testNikita Popov2012-08-131-2/+2
View Lorry Controller Status