summaryrefslogtreecommitdiff
path: root/ext/json/php_json.h
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headers to 2017Sammy Kaye Powers2017-01-041-1/+1
|
* Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-031-1/+1
| | | | Also re bug #71575.
* Fix bug #71575 removing extra semicolons outside macrosJames Titcumb2016-03-031-1/+1
|
* Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-011-1/+1
|\ | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-011-1/+1
| |
* | Move json_decode options macros bellow encode optionsJakub Zelenka2015-09-041-4/+4
| |
* | json: fix formating of PHP_JSON* option bitshiftsRyan McCullagh2015-09-041-12/+12
| |
* | these need to be exported for extensions that use jsonJoe Watkins2015-09-031-1/+1
| |
* | switch to the unified globals accessor where appropriateAnatol Belski2015-07-291-7/+3
| |
* | Fix bug #68546 (json_decode cannot access property started with \0)Jakub Zelenka2015-06-211-0/+1
| |
* | Set PHP_JSON_VERSION to 1.4.0Jakub Zelenka2015-02-171-1/+1
| |
* | fix json globalsMichael Wallner2015-02-091-0/+1
| |
* | Give me creditJakub Zelenka2015-02-021-0/+1
| |
* | Merge branch 'master' into jsondJakub Zelenka2015-01-251-1/+1
|\ \ | | | | | | | | | | | | | | | Conflicts: ext/json/JSON_parser.c ext/json/json.c
| * \ Merge branch 'PHP-5.6'Stanislav Malyshev2015-01-191-0/+1
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.6: Fixed bug #50224 where float without decimals were converted to integer Updated NEWS for #68371
| | * Fixed bug #50224 where float without decimals were converted to integerJuan Basso2015-01-191-0/+1
| | |
| | * bump yearXinchen Hui2015-01-151-1/+1
| | |
| | * Export JsonSerializable Interface (bug #65753)Julien Pauli2014-02-171-1/+1
| | |
| * | bump yearXinchen Hui2015-01-151-1/+1
| | |
* | | Porting implementation of RFC json_preserve_fractional_partJuan Basso2015-01-121-0/+1
| | |
* | | Merge branch 'master' into jsondJakub Zelenka2014-12-271-5/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/json/JSON_parser.c ext/json/JSON_parser.h ext/json/config.m4 ext/json/config.w32 ext/json/json.c ext/json/php_json.h
| * | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-4/+4
| | |
| * | ext/iconv, ext/json and ext/session use static tsrmls pointerAnatol Belski2014-10-171-1/+4
| | |
* | | Add missing bits to php_json.hJakub Zelenka2014-11-251-14/+18
| | |
* | | Add error codes to php_json.hJakub Zelenka2014-11-161-0/+13
|/ /
* | Move smart_str implementation into Zend/Nikita Popov2014-09-211-1/+1
| | | | | | | | | | | | | | | | So we can use it there as well... For now I've retained the zend_smart_str_public.h header, though it would probably be better to just move that one struct into zend_types.h.
* | s/PHP 5/PHP 7/Johannes Schlüter2014-09-191-1/+1
| |
* | fix signatureAnatol Belski2014-08-271-1/+1
| |
* | fix signatureAnatol Belski2014-08-271-1/+1
| |
* | master renames phase 1Anatol Belski2014-08-251-2/+2
| |
* | ported ext/jsonAnatol Belski2014-08-191-2/+2
| |
* | Export JsonSerializable Interface (bug #65753)Julien Pauli2014-02-171-1/+1
|/
* Bump yearXinchen Hui2014-01-031-1/+1
|
* Happy New YearXinchen Hui2013-01-011-1/+1
|
* Add optional depth parameter to json_encode #62369Florian Anderiasch2012-07-241-0/+1
|
* Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-06-231-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) andAdam Harvey2012-04-111-0/+1
| | | | | | | | remove a test case that's now mooted by this fix.
| * - Year++Felipe Pena2012-01-011-1/+1
| |
| * - Year++Felipe Pena2011-01-011-1/+1
| |
| * Added support for JSON_NUMERIC_CHECK option in json_encode() that converts Ilia Alshanetsky2010-05-201-0/+10
| | | | | | | | | | | | numeric strings to integers.
* | Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards ↵Stanislav Malyshev2012-05-011-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) andAdam Harvey2012-04-111-0/+1
| | | | | | | | remove a test case that's now mooted by this fix.
* | - Year++Felipe Pena2012-01-011-1/+1
| |
* | Add unescaped Unicode encoding to json_encode(). Closes bug #53946. Patch by ↵Gwynne Raskind2011-08-291-0/+1
| | | | | | | | Irker and Gwynne.
* | - Year++Felipe Pena2011-01-011-1/+1
| |
* | Implement FR #44331 (Formatting option for json_encode). Bikeshedding about theAdam Harvey2010-09-161-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 Harvey2010-09-161-0/+1
| |
* | Ooops, return values...Sara Golemon2010-05-211-1/+1
| |
* | Add JSON_BIGINT_AS_STRING for json_decode() to parse large numbersSara Golemon2010-05-211-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 Alshanetsky2010-05-201-0/+10
| | | | | | | | | | | | numeric strings to integers.
View Lorry Controller Status