summaryrefslogtreecommitdiff
path: root/ext/json
Commit message (Expand)AuthorAgeFilesLines
...
| | * Fixed bug #72787 (json_decode reads out of bounds)Jakub Zelenka2016-08-142-0/+21
| * | Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)"Xinchen Hui2016-05-062-77/+38
| * | Fixed bug #72170 (JsonSerializable may inc apply count without dec it)Xinchen Hui2016-05-062-38/+77
* | | Add return code from json API functionsJakub Zelenka2016-06-282-7/+12
* | | Use one place to define max length of doubleJakub Zelenka2016-06-262-18/+2
* | | Replace json.precision with serialize_precisionJakub Zelenka2016-06-263-40/+2
* | | Add castYasuo Ohgaki2016-06-261-1/+1
* | | Simply use ndigit for flag for zend_dtoa modeYasuo Ohgaki2016-06-261-5/+2
* | | Add JSON_G(precision)Yasuo Ohgaki2016-06-263-3/+41
* | | Initial patch for 0 mode float conversion. The magic number is better to be i...Yasuo Ohgaki2016-06-261-1/+5
* | | Fixed test according to FR #46600 ("_empty_" key in objects)Dmitry Stogov2016-06-221-3/+3
* | | Fixed compilation warningsDmitry Stogov2016-06-225-555/+556
* | | Use empty keys instead of _empty_ in json decodingJakub Zelenka2016-06-206-18/+12
* | | Add php_json_yyparse for direct use in json extJakub Zelenka2016-05-111-0/+2
* | | Fix and clean up exporting of json parserJakub Zelenka2016-05-113-7/+17
* | | Merge branch 'json_parser_method' into json_parser_method_embedJakub Zelenka2016-05-033-1/+34
|\ \ \
| * \ \ Merge branch 'master' into json_parser_methodJakub Zelenka2016-05-033-1/+34
| |\ \ \
| | * \ \ Merge branch 'PHP-7.0'Xinchen Hui2016-04-223-1/+34
| | |\ \ \ | | | |/ /
| | | * | Fixed bug #72069 (Behavior \JsonSerializable different from json_encode)Xinchen Hui2016-04-223-1/+34
* | | | | Use embedded json parser method structureJakub Zelenka2016-05-023-27/+27
|/ / / /
* | | | Remove json parser depth methods and tidy it upJakub Zelenka2016-04-103-111/+77
* | | | Add method hooking support to json parserJakub Zelenka2016-04-103-99/+287
|/ / /
* | | Merge branch 'PHP-7.0'Xinchen Hui2016-03-221-0/+10
|\ \ \ | |/ /
| * | Update test scriptXinchen Hui2016-03-221-0/+10
* | | Merge branch 'PHP-7.0'Xinchen Hui2016-03-211-0/+17
|\ \ \ | |/ /
| * | Fix bug #71835 (json_encode sometimes incorrectly detects recursion with Json...Jakub Zelenka2016-03-201-0/+17
* | | Merge branch 'PHP-7.0'Nikita Popov2016-03-032-3/+3
|\ \ \ | |/ /
| * | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-032-2/+2
| * | Fix bug #71575 removing extra semicolons outside macrosJames Titcumb2016-03-031-1/+1
* | | json_encode: Escape U+2028 and U+2029 more often.Eddie Kohler2016-01-224-1/+48
|/ /
* | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-018-8/+8
* | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-012-2/+2
|\ \ | |/
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-012-2/+2
* | Merge branch 'PHP-5.6' into PHP-7.0Jakub Zelenka2015-11-1532-253/+185
|\ \ | |/
| * Use the same CS for all json testsJakub Zelenka2015-11-1532-252/+185
* | Simplify JSON constants registrationJakub Zelenka2015-09-041-26/+33
* | Add my name to authors for previous refactoringJakub Zelenka2015-09-041-0/+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-032-2/+2
* | switch to the unified globals accessor where appropriateAnatol Belski2015-07-291-7/+3
* | Merge branch 'PHP-5.6'Christoph M. Becker2015-07-212-0/+43
|\ \ | |/
| * Add tests for json_last_error()/json_last_error_msg() failuresKubo22015-07-212-0/+43
| * Merge remote-tracking branch 'github/pr/637' into PHP-5.6Stanislav Malyshev2015-04-186-219/+2
| |\
| | * Remove unused code from ext/json.Rouven Weßling2014-03-304-199/+2
* | | Regenerate bison and re2c files in jsonJakub Zelenka2015-07-184-1141/+1022
* | | Use ZSTR_ API to access zend_string elements (this is just renaming without s...Dmitry Stogov2015-06-307-1033/+1152
* | | Fix incompatible JSON errorsJakub Zelenka2015-06-283-486/+662
* | | Fix bug #62010 (json_decode produces invalid byte-sequences)Jakub Zelenka2015-06-284-209/+250
* | | Bump re2c version for json scannerJakub Zelenka2015-06-283-3/+3