summaryrefslogtreecommitdiff
path: root/ext/json
Commit message (Expand)AuthorAgeFilesLines
* Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are numbers p...Jakub Zelenka2015-02-222-11/+21
* Revert "json_decode() should generate a syntax error when given ""."Julien Pauli2015-02-043-19/+2
* json_decode() should generate a syntax error when given "".Adam Harvey2015-02-023-2/+19
* Bump yearXinchen Hui2015-01-152-2/+2
* Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-08-171-1/+1
|\
| * typofixesVeres Lajos2014-08-171-1/+1
* | 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
* | | 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
* | 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
* | Fix test failed due to new feature introduced in 45d596eaXinchen Hui2012-07-292-4/+2
* | Add optional depth parameter to json_encode #62369Florian Anderiasch2012-07-243-1/+44
|/
* 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-288-42/+51
|\
| * Add json_last_error_msg() functionNikita Popov2012-06-288-42/+51
* | Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-06-2711-58/+113
|\ \ | |/
| * Improve JSON error handlingNikita Popov2012-06-278-49/+92
* | Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-06-2314-26/+147
|\ \ | |/
| * Improve json_encode error handlingNikita Popov2012-06-239-13/+110
| * Fix bug #61537 (json_encode() incorrectly truncates/discards information) andAdam Harvey2012-04-115-25/+45
* | Revert "Update test to fix breakage caused by the previous commit."Stanislav Malyshev2012-05-151-7/+3
* | - Fixed bug #61978 (Object recursion not detected for classes that implement ...Felipe Pena2012-05-082-0/+60
* | Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards informat...Stanislav Malyshev2012-05-015-45/+25
* | Update test to fix breakage caused by the previous commit.Adam Harvey2012-04-111-3/+7
* | Fix bug #61537 (json_encode() incorrectly truncates/discards information) andAdam Harvey2012-04-115-25/+45
* | 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-012-2/+2
| * Fixed bug #55543 (json_encode() with JSON_NUMERIC_CHECK fails on objects with...Ilia Alshanetsky2011-10-172-1/+14
| * - Make usage of new PHP_FE_END macroFelipe Pena2011-07-251-1/+1
| * Remove duplicate lines present in PHP_5_3's .phpt (dtajchreber)Christopher Jones2011-06-171-25/+0
| * Fixed bug #54484 (Empty string in json_decode doesn't reset json_last_error()).Ilia Alshanetsky2011-06-012-0/+52
| * Fix Bug #54058, invalid utf-8 doesn't set json_encode() in all casesScott MacVicar2011-02-212-1/+37