Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Bump year | Xinchen Hui | 2014-01-03 | 1 | -1/+1 | |
| | ||||||
* | Happy New Year | Xinchen Hui | 2013-01-01 | 1 | -1/+1 | |
| | ||||||
* | Add optional depth parameter to json_encode #62369 | Florian Anderiasch | 2012-07-24 | 1 | -0/+1 | |
| | ||||||
* | Merge branch 'PHP-5.3' into PHP-5.4 | Nikita Popov | 2012-06-23 | 1 | -0/+1 | |
|\ | | | | | | | | | | | | | | | | | * PHP-5.3: Improve json_encode error handling - BFN Conflicts: ext/json/json.c | |||||
| * | Fix bug #61537 (json_encode() incorrectly truncates/discards information) and | Adam Harvey | 2012-04-11 | 1 | -0/+1 | |
| | | | | | | | | remove a test case that's now mooted by this fix. | |||||
| * | - Year++ | Felipe Pena | 2012-01-01 | 1 | -1/+1 | |
| | | ||||||
| * | - Year++ | Felipe Pena | 2011-01-01 | 1 | -1/+1 | |
| | | ||||||
| * | Added support for JSON_NUMERIC_CHECK option in json_encode() that converts | Ilia Alshanetsky | 2010-05-20 | 1 | -0/+10 | |
| | | | | | | | | | | | | numeric strings to integers. | |||||
* | | Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards ↵ | Stanislav Malyshev | 2012-05-01 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | information) and" This reverts commit cb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b. The fix is not correct, not fixed after discussion on github. Please fix the issues and reapply the patch | |||||
* | | Fix bug #61537 (json_encode() incorrectly truncates/discards information) and | Adam Harvey | 2012-04-11 | 1 | -0/+1 | |
| | | | | | | | | remove a test case that's now mooted by this fix. | |||||
* | | - Year++ | Felipe Pena | 2012-01-01 | 1 | -1/+1 | |
| | | ||||||
* | | Add unescaped Unicode encoding to json_encode(). Closes bug #53946. Patch by ↵ | Gwynne Raskind | 2011-08-29 | 1 | -0/+1 | |
| | | | | | | | | Irker and Gwynne. | |||||
* | | - Year++ | Felipe Pena | 2011-01-01 | 1 | -1/+1 | |
| | | ||||||
* | | Implement FR #44331 (Formatting option for json_encode). Bikeshedding about the | Adam Harvey | 2010-09-16 | 1 | -0/+2 | |
| | | | | | | | | | | | | exact form of the JSON pretty printing and brace handling will only be accepted in the form of patches. ;) | |||||
* | | Implemented FR #49366 (Make slash escaping optional in json_encode()). | Adam Harvey | 2010-09-16 | 1 | -0/+1 | |
| | | ||||||
* | | Ooops, return values... | Sara Golemon | 2010-05-21 | 1 | -1/+1 | |
| | | ||||||
* | | Add JSON_BIGINT_AS_STRING for json_decode() to parse large numbers | Sara Golemon | 2010-05-21 | 1 | -3/+16 | |
| | | | | | | | | | | as strings rather than casting to double and loosing precision. | |||||
* | | Added support for JSON_NUMERIC_CHECK option in json_encode() that converts | Ilia Alshanetsky | 2010-05-20 | 1 | -0/+10 | |
| | | | | | | | | | | | | numeric strings to integers. | |||||
* | | Add JSON_Serializable interface | Sara Golemon | 2010-05-05 | 1 | -0/+1 | |
|/ | | | | | | | | Objects implementing JSON_Serializable will have their ->jsonSerialize() method called Similar to serialize() and __sleep() | |||||
* | sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php | Sebastian Bergmann | 2010-01-03 | 1 | -1/+1 | |
| | ||||||
* | fix json shared build on Windows | Stanislav Malyshev | 2009-06-30 | 1 | -2/+8 | |
| | ||||||
* | Fix the build. | Andrei Zmievski | 2009-05-31 | 1 | -0/+1 | |
| | ||||||
* | Expose encode/decode API. | Andrei Zmievski | 2009-05-31 | 1 | -0/+3 | |
| | ||||||
* | MFH: Bump copyright year, 3 of 3. | Sebastian Bergmann | 2008-12-31 | 1 | -1/+1 | |
| | ||||||
* | MFH Add json_last_error() for getting a bit of information about what failed ↵ | Scott MacVicar | 2008-12-19 | 1 | -0/+10 | |
| | | | | | | | during a decode, also fixes a segfault when we have [1} [DOC] | |||||
* | MFH: unused stuff | Jani Taskinen | 2008-07-22 | 1 | -7/+0 | |
| | ||||||
* | remove unused PHP_EXTNAME_API macros. | Nuno Lopes | 2008-01-03 | 1 | -6/+0 | |
| | | | | | #in preparation for the gcc 4 visibility patch | |||||
* | MFH: Bump copyright year, 2 of 2. | Sebastian Bergmann | 2007-12-31 | 1 | -1/+1 | |
| | ||||||
* | MFH: Bump year. | Sebastian Bergmann | 2007-01-01 | 1 | -1/+1 | |
| | ||||||
* | move static declaration to *.c files | Nuno Lopes | 2006-08-14 | 1 | -5/+0 | |
| | | | | | mroe static/const keywording | |||||
* | This commit was manufactured by cvs2svn to create branch 'PHP_5_2'. | SVN Migration | 2006-05-05 | 1 | -0/+60 | |