| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'PHP-7.0' into PHP-7.1 | Julien Pauli | 2016-09-19 | 1 | -1/+3 |
| |\ | | | | | | | | | | | | | | | * 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 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | * PHP-5.6: Do not wrap user exception in case of custom JSON serialization Conflicts: ext/json/json.c | ||||
| * | | 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 | 1 | -38/+54 |
| | | | |||||
| * | | Use one place to define max length of double | Jakub Zelenka | 2016-06-26 | 1 | -10/+2 |
| | | | | | | | | | Introduce new constant PHP_DOUBLE_MAX_LENGTH for that purpose | ||||
| * | | Replace json.precision with serialize_precision | Jakub Zelenka | 2016-06-26 | 1 | -1/+1 |
| | | | |||||
| * | | 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 | 1 | -2/+2 |
| | | | |||||
| * | | 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? | ||||
| * | | Use empty keys instead of _empty_ in json decoding | Jakub Zelenka | 2016-06-20 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-05-06 | 1 | -45/+38 |
| |\ \ | |/ | | | | | | | * PHP-7.0: Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)" | ||||
| | * | Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)" | Xinchen Hui | 2016-05-06 | 1 | -45/+38 |
| | | | | | | | | | This reverts commit 459a7cc209da130256d66c1f896199540f4dadbc. | ||||
| * | | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-05-06 | 1 | -38/+45 |
| |\ \ | |/ | | | | | | | * PHP-7.0: Fixed bug #72170 (JsonSerializable may inc apply count without dec it) | ||||
| | * | Fixed bug #72170 (JsonSerializable may inc apply count without dec it) | Xinchen Hui | 2016-05-06 | 1 | -38/+45 |
| | | | | | | | | | I don't want use zend_try here, but seems I have no choice :< | ||||
| * | | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-04-22 | 1 | -0/+4 |
| |\ \ | |/ | |||||
| | * | Fixed bug #72069 (Behavior \JsonSerializable different from json_encode) | Xinchen Hui | 2016-04-22 | 1 | -0/+4 |
| | | | |||||
| * | | json_encode: Escape U+2028 and U+2029 more often. | Eddie Kohler | 2016-01-22 | 1 | -1/+10 |
| |/ | | | | | | | | | 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 Kaplan | 2016-01-01 | 1 | -1/+1 |
| | | |||||
| * | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵ | Dmitry Stogov | 2015-06-30 | 1 | -5/+5 |
| | | | | | semantick changes). | ||||
| * | Use Z_ARRVAL_P since we already know it's an array | Xinchen Hui | 2015-05-06 | 1 | -3/+3 |
| | | |||||
| * | fix datatype mismatches | Anatol Belski | 2015-03-25 | 1 | -1/+1 |
| | | |||||
| * | Improved php_json_escape_string() | Dmitry Stogov | 2015-03-11 | 1 | -98/+103 |
| | | |||||
| * | Merge branch 'PHP-5.6' | Jakub Zelenka | 2015-02-22 | 1 | -17/+24 |
| | | | | | The fix for master is a bit different (it's fixed in encoder) | ||||
| * | fix json globals | Michael Wallner | 2015-02-09 | 1 | -2/+0 |
| | | |||||
| * | size_t vs int | Anatol Belski | 2015-02-09 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into jsond | Jakub Zelenka | 2015-02-08 | 1 | -1/+1 |
| | | | | | | Conflicts: ext/json/json.c | ||||
| * | Give me credit | Jakub Zelenka | 2015-02-02 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'master' into jsond | Jakub Zelenka | 2015-01-25 | 1 | -1/+1 |
| | | | | | | | Conflicts: ext/json/JSON_parser.c ext/json/json.c | ||||
| * | Increase PHP_JSON_DOUBLE_MAX_LENGTH for fractional part | Jakub Zelenka | 2015-01-18 | 1 | -2/+2 |
| | | | | | | | This is probably not necessary as such number is not realistic. It's just to be consistent with jsond extension. | ||||
| * | Porting implementation of RFC json_preserve_fractional_part | Juan Basso | 2015-01-12 | 1 | -3/+8 |
| | | |||||
| * | Refactore json double encoding to use php_gcvt | Jakub Zelenka | 2015-01-11 | 1 | -23/+25 |
| | | |||||
| * | Replace encoder functions json prefix with php_json | Jakub Zelenka | 2015-01-10 | 1 | -25/+25 |
| | | |||||
| * | Merge branch 'master' into jsond | Jakub Zelenka | 2014-12-27 | 1 | -34/+34 |
| | | | | | | | | | | | 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 | ||||
| * | Fix compilation for json_encoder | Jakub Zelenka | 2014-11-30 | 1 | -0/+4 |
| | | |||||
| * | Move json encoding stuff | Jakub Zelenka | 2014-11-24 | 1 | -0/+537 |
 |
index : delta/php-git.git | |
| git.php.net: repository/php-src.git |
| summaryrefslogtreecommitdiff |