Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Happy New Year~ | Xinchen Hui | 2013-01-01 | 2 | -2/+2 |
| | |||||
* | Revert change 3f3ad30c50: There shouldn't be new features in 5.3, especially | johannes | 2012-07-05 | 5 | -45/+25 |
| | | | | not if they aren't in 5.4, too. | ||||
* | Revert JSON changes to PHP 5.3 | Nikita Popov | 2012-07-01 | 12 | -195/+46 |
| | | | | | | | | | | This reverts the following commits: 974324676b2436f159f42d9241c569f813471684 4662151ea7d7b6920d115cf2a2d6e9d4232727a3 84fe2cc890e49f40bac7c3ba74b3cfc6dc4cef2f This does not revert the JSON changes released in PHP 5.3.14. | ||||
* | Add json_last_error_msg() function | Nikita Popov | 2012-06-28 | 8 | -42/+51 |
| | | | | | This replaces json_last_error(true) and is consistent with other custom error handling functions. | ||||
* | Improve JSON error handling | Nikita Popov | 2012-06-27 | 8 | -49/+92 |
| | | | | | | | | | json_encode() no longer throws warnings. Instead only the error code for json_last_error() is set. As it is hard to debug the error from just an error code an optional $as_string parameter was added to json_last_error(), which returns an error message instead of an error code. | ||||
* | Improve json_encode error handling | Nikita Popov | 2012-06-23 | 9 | -13/+110 |
| | | | | | | | | | | | | | | | | | | | json_encode() now returns bool(false) for all possible errors, throws the respective warning and also sets the respective json_last_error() error code. Three new error codes have been added: * JSON_ERROR_RECURSION * JSON_ERROR_INF_OR_NAN * JSON_ERROR_UNSUPPORTED_TYPE To get a partial JSON output instead of bool(false) the option JSON_PARTIAL_OUTPUT_ON_ERROR can be specified. In this case the invalid segments will be replaced either by null (for recursion, unsupported type and invalid JSON) or 0 (for Inf and NaN). The warning for invalid UTF-8 stays intact and is thrown also with display_errors = On. If this behavior is undesired this can be remedied later. | ||||
* | Fix bug #61537 (json_encode() incorrectly truncates/discards information) and | Adam Harvey | 2012-04-11 | 5 | -25/+45 |
| | | | | remove a test case that's now mooted by this fix. | ||||
* | Adding Braces in json.c to conform with coding standards | Matt Nowack | 2012-03-20 | 1 | -1/+2 |
| | |||||
* | - Year++ | Felipe Pena | 2012-01-01 | 2 | -2/+2 |
| | |||||
* | Fixed bug #55543 (json_encode() with JSON_NUMERIC_CHECK fails on objects ↵ | Ilia Alshanetsky | 2011-10-17 | 2 | -1/+14 |
| | | | | with numeric string properties) | ||||
* | - Make usage of new PHP_FE_END macro | Felipe Pena | 2011-07-25 | 1 | -1/+1 |
| | |||||
* | Remove duplicate lines present in PHP_5_3's .phpt (dtajchreber) | Christopher Jones | 2011-06-17 | 1 | -25/+0 |
| | |||||
* | Fixed bug #54484 (Empty string in json_decode doesn't reset json_last_error()). | Ilia Alshanetsky | 2011-06-01 | 2 | -0/+52 |
| | |||||
* | Fix Bug #54058, invalid utf-8 doesn't set json_encode() in all cases | Scott MacVicar | 2011-02-21 | 2 | -1/+37 |
| | |||||
* | Fix Bug #53963, error code isn't always set in certain error cases. | Scott MacVicar | 2011-02-09 | 1 | -0/+2 |
| | |||||
* | - Year++ | Felipe Pena | 2011-01-01 | 2 | -2/+2 |
| | |||||
* | Fix English in the error message emitted when json_decode() is called with | Adam Harvey | 2010-09-14 | 1 | -1/+1 |
| | | | | | depth <= 0. | ||||
* | Fix bug #52262 - Invalid UTF-8 documents don't set an error code when they ↵ | Scott MacVicar | 2010-07-06 | 1 | -0/+1 |
| | | | | fail to decode. | ||||
* | Added support for JSON_NUMERIC_CHECK option in json_encode() that converts | Ilia Alshanetsky | 2010-05-20 | 3 | -13/+39 |
| | | | | | | numeric strings to integers. | ||||
* | - Fixed bug #51590 (JSON_ERROR_UTF8 is undefined) | Felipe Pena | 2010-04-18 | 1 | -0/+1 |
| | |||||
* | - Fixed tests | Felipe Pena | 2010-04-03 | 2 | -8/+2 |
| | |||||
* | sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php | Sebastian Bergmann | 2010-01-03 | 2 | -2/+2 |
| | |||||
* | Fix broken json tests in all branches | Rasmus Lerdorf | 2009-08-03 | 1 | -16/+8 |
| | |||||
* | MFH: Add error constant when json_encode detects an invalid UTF-8 sequence. | Scott MacVicar | 2009-07-27 | 2 | -0/+3 |
| | |||||
* | fix tests corrupted by svn's eol-style=native | Alexey Zakhlestin | 2009-07-15 | 2 | -32/+16 |
| | |||||
* | fix json shared build on Windows | Stanislav Malyshev | 2009-06-30 | 2 | -4/+10 |
| | |||||
* | - MFH: Fixed memleak when depth arg is less than zero | Felipe Pena | 2009-06-24 | 1 | -0/+1 |
| | |||||
* | The json header should be installed so other exts can use it | Johannes Schlüter | 2009-06-23 | 1 | -0/+1 |
| | |||||
* | New json extension tests. Tested on Windows, Linux and Linux 64 bit. | andy wharmby | 2009-06-14 | 5 | -0/+450 |
| | |||||
* | Fix the build. | Andrei Zmievski | 2009-05-31 | 1 | -0/+1 |
| | |||||
* | MFH: no dots in errors | Jani Taskinen | 2009-05-31 | 1 | -3/+3 |
| | |||||
* | Expose encode/decode API. | Andrei Zmievski | 2009-05-31 | 2 | -43/+53 |
| | |||||
* | Cast to unsigned char to prevent compiler warning | Kalle Sommer Nielsen | 2009-05-19 | 1 | -1/+1 |
| | |||||
* | MFH: Fix arginfo | Kalle Sommer Nielsen | 2009-05-15 | 1 | -0/+1 |
| | |||||
* | MFH Allow a custom recursion depth to be specified for json_decode() | Scott MacVicar | 2009-05-14 | 3 | -7/+15 |
| | |||||
* | Rebuild credits, was missed in previous RC | Scott MacVicar | 2009-04-02 | 1 | -1/+1 |
| | |||||
* | MFH: Avoid 2 conversions when decoding numbers | Matt Wilmas | 2009-03-19 | 1 | -6/+17 |
| | |||||
* | MFH Missing skip in tests | Scott MacVicar | 2009-03-17 | 1 | -0/+2 |
| | |||||
* | MFH Replace magic values with a define for json encoding, makes reading it a ↵ | Scott MacVicar | 2009-03-17 | 1 | -7/+10 |
| | | | | bit easier | ||||
* | MFH Add PHP_JSON_FORCE_OBJECT for forcing an object output of an array | Scott MacVicar | 2009-03-17 | 2 | -1/+13 |
| | |||||
* | MFH Deal with overflow when decoding large numbers | Scott MacVicar | 2009-03-17 | 1 | -2/+3 |
| | |||||
* | MFH Fix bug #47644 - Valid integers are truncated with json_decode() | Scott MacVicar | 2009-03-17 | 2 | -4/+47 |
| | |||||
* | Fix tests. Add missing SKIPIF. Tested on Windows, Linux and Linux 64 | andy wharmby | 2009-01-23 | 2 | -10/+16 |
| | |||||
* | Fix test again... | Scott MacVicar | 2009-01-08 | 1 | -2/+2 |
| | |||||
* | Fix broken test | Scott MacVicar | 2009-01-08 | 1 | -1/+4 |
| | |||||
* | MFH Fix bug #46944 - UTF-8 characters outside the BMP aren't encoded correctly. | Scott MacVicar | 2009-01-02 | 3 | -2/+34 |
| | |||||
* | MFH: Bump copyright year, 3 of 3. | Sebastian Bergmann | 2008-12-31 | 2 | -2/+2 |
| | |||||
* | MFH Make sure we clear out the error when the scalar version decoding works. | Scott MacVicar | 2008-12-24 | 1 | -0/+6 |
| | |||||
* | MFH Add json_last_error() for getting a bit of information about what failed ↵ | Scott MacVicar | 2008-12-19 | 5 | -28/+107 |
| | | | | | | | during a decode, also fixes a segfault when we have [1} [DOC] | ||||
* | MFH Fix Windows build | Scott MacVicar | 2008-12-17 | 1 | -0/+3 |
| |