summaryrefslogtreecommitdiff
path: root/ext/json
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.0' into PHP-7.1Julien Pauli2016-09-193-2/+27
|\ | | | | | | | | | | | | | | * PHP-7.0: Do not wrap user exception in case of custom JSON serialization Conflicts: ext/json/json_encoder.c
| * Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2016-09-192-1/+27
| |\ | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Do not wrap user exception in case of custom JSON serialization Conflicts: ext/json/json.c
| | * Do not wrap user exception in case of custom JSON serializationJulien Pauli2016-09-192-1/+27
| | |
* | | Fix 73113 - Segfault with throwing JsonSerializableJulien Pauli2016-09-191-1/+4
| | |
* | | Bump PHP_JSON_VERSION to 1.5.0Jakub Zelenka2016-08-291-1/+1
| | |
* | | Add test for fixed bug #68992Jakub Zelenka2016-08-291-0/+30
| | |
* | | Fix recursion and protection in the failed JSON encodingJakub Zelenka2016-08-291-11/+20
| | |
* | | Add initial failure checking for json_encodeJakub Zelenka2016-08-293-42/+56
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2016-08-142-0/+25
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Jakub Zelenka2016-08-142-0/+25
| |\ \ | | |/
| | * 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
| | | | | | | | | | | | This reverts commit 459a7cc209da130256d66c1f896199540f4dadbc.
| * | Fixed bug #72170 (JsonSerializable may inc apply count without dec it)Xinchen Hui2016-05-062-38/+77
| | | | | | | | | | | | I don't want use zend_try here, but seems I have no choice :<
* | | Add return code from json API functionsJakub Zelenka2016-06-282-7/+12
| | | | | | | | | | | | It will allow fix few json bugs in a better way
* | | Use one place to define max length of doubleJakub Zelenka2016-06-262-18/+2
| | | | | | | | | | | | Introduce new constant PHP_DOUBLE_MAX_LENGTH for that purpose
* | | 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 ↵Yasuo Ohgaki2016-06-261-1/+5
| | | | | | | | | | | | improved. Any suggestion where to define it?
* | | 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
|/ / / | | | | | | | | | | | | | | | | | | This commit is just a slight modification (renaming and some small changes) of the patch that has been provided by Andrey Hristov. It adds support for hooking of the json parser operations and allows re-using of modified JSON parsing outside of json ext.
* | | Merge branch 'PHP-7.0'Xinchen Hui2016-03-221-0/+10
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Update test script
| * | Update test scriptXinchen Hui2016-03-221-0/+10
| | |
* | | Merge branch 'PHP-7.0'Xinchen Hui2016-03-211-0/+17
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)
| * | Fix bug #71835 (json_encode sometimes incorrectly detects recursion with ↵Jakub Zelenka2016-03-201-0/+17
| | | | | | | | | | | | JsonSerializable)
* | | Merge branch 'PHP-7.0'Nikita Popov2016-03-032-3/+3
|\ \ \ | |/ /
| * | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-032-2/+2
| | | | | | | | | | | | Also re bug #71575.
| * | 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
|/ / | | | | | | | | | | | | | | | | These characters are illegal in Javascript, so leaving them unescaped is risky. The default encoder ($flags = 0) is fine, but the encoder with JSON_UNESCAPED_UNICODE flag is not. In case anyone wants the ability to leave these characters unescaped, provide JSON_UNESCAPED_LINE_TERMINATORS.
* | 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
|\ \ | |/ | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * 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
| | | | | | | | Related to jsond changes
* | 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
| |
View Lorry Controller Status