summaryrefslogtreecommitdiff
path: root/ext/json
Commit message (Expand)AuthorAgeFilesLines
...
| | * remove TSRMLS_*Anatol Belski2016-11-211-2/+2
* | | Merge branch 'PHP-7.1'Jakub Zelenka2016-11-201-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2016-11-201-1/+1
| |\ \ | | |/
| | * Fix bug #73526 (php_json_encode depth issue)Jakub Zelenka2016-11-201-1/+1
* | | json_encode(): Detect recursion earlierNikita Popov2016-11-194-24/+19
* | | Merge branch 'PHP-7.1'Jakub Zelenka2016-10-305-47/+116
|\ \ \ | |/ /
| * | Introduce json encoder to fix globals related issuesJakub Zelenka2016-10-305-47/+116
* | | Merge branch 'PHP-7.1'Dmitry Stogov2016-10-191-0/+4
|\ \ \ | |/ /
| * | Introduced HT_IS_PACKED() and HT_IS_WITHOUT_HOLES() macros. (Benjamin Coutu)Dmitry Stogov2016-10-191-0/+4
* | | Install ext/json headers so that other extension can parse, tooJohannes Schlüter2016-10-181-1/+1
|/ /
* | Merge branch 'PHP-7.0' into PHP-7.1Julien Pauli2016-09-193-2/+27
|\ \ | |/
| * Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2016-09-192-1/+27
| |\
| | * 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
| * | 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
|/ /