| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | add nmakefile fragment for json | Anatol Belski | 2017-01-04 | 2 | -0/+8 |
| | | |||||
| * | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-02 | 10 | -10/+10 |
| | | |||||
| * | Use new param API in json | Sara Golemon | 2016-12-31 | 1 | -6/+13 |
| | | |||||
| * | Merge branch 'PHP-7.1' | Anatol Belski | 2016-11-22 | 1 | -2/+2 |
| |\ | | | | | | | | | * PHP-7.1: remove TSRMLS_* | ||||
| | * | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2016-11-22 | 1 | -2/+2 |
| | |\ | | | | | | | | | | | | | * PHP-7.0: remove TSRMLS_* | ||||
| | | * | remove TSRMLS_* | Anatol Belski | 2016-11-21 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'PHP-7.1' | Jakub Zelenka | 2016-11-20 | 1 | -1/+1 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'PHP-7.0' into PHP-7.1 | Jakub Zelenka | 2016-11-20 | 1 | -1/+1 |
| | |\ \ | | |/ | |||||
| | | * | Fix bug #73526 (php_json_encode depth issue) | Jakub Zelenka | 2016-11-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | json_encode(): Detect recursion earlier | Nikita Popov | 2016-11-19 | 4 | -24/+19 |
| | | | | | | | | | | | | | | | | | | | | | | json_encode() used a peculiar way of apply-count management, whereby the apply-count was not incremented for the outermost object/array, so that recursion was only detected after two levels. | ||||
| * | | | Merge branch 'PHP-7.1' | Jakub Zelenka | 2016-10-30 | 5 | -47/+116 |
| |\ \ \ | |/ / | |||||
| | * | | Introduce json encoder to fix globals related issues | Jakub Zelenka | 2016-10-30 | 5 | -47/+116 |
| | | | | | | | | | | | | | | | | | | | It fixes bugs #66025 and #73254 by replacing globals with a passed structure holding depth and error code. In addition it fixes #72069 in a more generic way. | ||||
| * | | | Merge branch 'PHP-7.1' | Dmitry Stogov | 2016-10-19 | 1 | -0/+4 |
| |\ \ \ | |/ / | | | | | | | | | | * PHP-7.1: Introduced HT_IS_PACKED() and HT_IS_WITHOUT_HOLES() macros. (Benjamin Coutu) | ||||
| | * | | Introduced HT_IS_PACKED() and HT_IS_WITHOUT_HOLES() macros. (Benjamin Coutu) | Dmitry Stogov | 2016-10-19 | 1 | -0/+4 |
| | | | | |||||
| * | | | Install ext/json headers so that other extension can parse, too | Johannes Schlüter | 2016-10-18 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Julien Pauli | 2016-09-19 | 3 | -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.0 | Julien Pauli | 2016-09-19 | 2 | -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 serialization | Julien Pauli | 2016-09-19 | 2 | -1/+27 |
| | | | | |||||
| * | | | Fix 73113 - Segfault with throwing JsonSerializable | Julien Pauli | 2016-09-19 | 1 | -1/+4 |
| | | | | |||||
| * | | | Bump PHP_JSON_VERSION to 1.5.0 | Jakub Zelenka | 2016-08-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add test for fixed bug #68992 | Jakub Zelenka | 2016-08-29 | 1 | -0/+30 |
| | | | | |||||
| * | | | Fix recursion and protection in the failed JSON encoding | Jakub Zelenka | 2016-08-29 | 1 | -11/+20 |
| | | | | |||||
| * | | | Add initial failure checking for json_encode | Jakub Zelenka | 2016-08-29 | 3 | -42/+56 |
| | | | | |||||
| * | | | Merge branch 'PHP-7.0' into PHP-7.1 | Jakub Zelenka | 2016-08-14 | 2 | -0/+25 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'PHP-5.6' into PHP-7.0 | Jakub Zelenka | 2016-08-14 | 2 | -0/+25 |
| | |\ \ | | |/ | |||||
| | | * | Fixed bug #72787 (json_decode reads out of bounds) | Jakub Zelenka | 2016-08-14 | 2 | -0/+21 |
| | | | | |||||
| | * | | Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)" | Xinchen Hui | 2016-05-06 | 2 | -77/+38 |
| | | | | | | | | | | | | | This reverts commit 459a7cc209da130256d66c1f896199540f4dadbc. | ||||
| | * | | Fixed bug #72170 (JsonSerializable may inc apply count without dec it) | Xinchen Hui | 2016-05-06 | 2 | -38/+77 |
| | | | | | | | | | | | | | I don't want use zend_try here, but seems I have no choice :< | ||||
| * | | | Add return code from json API functions | Jakub Zelenka | 2016-06-28 | 2 | -7/+12 |
| | | | | | | | | | | | | | It will allow fix few json bugs in a better way | ||||
| * | | | Use one place to define max length of double | Jakub Zelenka | 2016-06-26 | 2 | -18/+2 |
| | | | | | | | | | | | | | Introduce new constant PHP_DOUBLE_MAX_LENGTH for that purpose | ||||
| * | | | Replace json.precision with serialize_precision | Jakub Zelenka | 2016-06-26 | 3 | -40/+2 |
| | | | | |||||
| * | | | Add cast | Yasuo Ohgaki | 2016-06-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Simply use ndigit for flag for zend_dtoa mode | Yasuo Ohgaki | 2016-06-26 | 1 | -5/+2 |
| | | | | |||||
| * | | | Add JSON_G(precision) | Yasuo Ohgaki | 2016-06-26 | 3 | -3/+41 |
| | | | | |||||
| * | | | Initial patch for 0 mode float conversion. The magic number is better to be ↵ | Yasuo Ohgaki | 2016-06-26 | 1 | -1/+5 |
| | | | | | | | | | | | | | improved. Any suggestion where to define it? | ||||
| * | | | Fixed test according to FR #46600 ("_empty_" key in objects) | Dmitry Stogov | 2016-06-22 | 1 | -3/+3 |
| | | | | |||||
| * | | | Fixed compilation warnings | Dmitry Stogov | 2016-06-22 | 5 | -555/+556 |
| | | | | |||||
| * | | | Use empty keys instead of _empty_ in json decoding | Jakub Zelenka | 2016-06-20 | 6 | -18/+12 |
| | | | | |||||
| * | | | Add php_json_yyparse for direct use in json ext | Jakub Zelenka | 2016-05-11 | 1 | -0/+2 |
| | | | | |||||
| * | | | Fix and clean up exporting of json parser | Jakub Zelenka | 2016-05-11 | 3 | -7/+17 |
| | | | | |||||
| * | | | Merge branch 'json_parser_method' into json_parser_method_embed | Jakub Zelenka | 2016-05-03 | 3 | -1/+34 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into json_parser_method | Jakub Zelenka | 2016-05-03 | 3 | -1/+34 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-04-22 | 3 | -1/+34 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | Fixed bug #72069 (Behavior \JsonSerializable different from json_encode) | Xinchen Hui | 2016-04-22 | 3 | -1/+34 |
| | | | | | | |||||
| * | | | | | Use embedded json parser method structure | Jakub Zelenka | 2016-05-02 | 3 | -27/+27 |
| |/ / / / | |||||
| * | | | | Remove json parser depth methods and tidy it up | Jakub Zelenka | 2016-04-10 | 3 | -111/+77 |
| | | | | | |||||
| * | | | | Add method hooking support to json parser | Jakub Zelenka | 2016-04-10 | 3 | -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 Hui | 2016-03-22 | 1 | -0/+10 |
| |\ \ \ | |/ / | | | | | | | | | | * PHP-7.0: Update test script | ||||
| | * | | Update test script | Xinchen Hui | 2016-03-22 | 1 | -0/+10 |
| | | | | |||||
| * | | | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-03-21 | 1 | -0/+17 |
| |\ \ \ | |/ / | | | | | | | | | | * PHP-7.0: Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable) | ||||
 |
index : delta/php-git.git | |
| git.php.net: repository/php-src.git |
| summaryrefslogtreecommitdiff |