Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed bug #77843 | Nikita Popov | 2019-04-23 | 2 | -2/+35 |
* | Sync leading and final newlines in *.phpt sections | Peter Kokot | 2018-10-15 | 5 | -6/+0 |
* | Trim trailing whitespace in *.phpt | Peter Kokot | 2018-10-14 | 14 | -21/+21 |
* | Sync leading and final newlines in source code files | Peter Kokot | 2018-10-14 | 5 | -5/+0 |
* | Trim trailing whitespace in source code files | Peter Kokot | 2018-10-13 | 1 | -1/+1 |
* | year++ | Xinchen Hui | 2018-01-02 | 10 | -10/+10 |
* | Merge branch 'PHP-7.1' into PHP-7.2 | Jakub Zelenka | 2017-12-30 | 6 | -6/+4 |
|\ | |||||
| * | Use seialize_precision instead of precision in all json tests | Jakub Zelenka | 2017-12-30 | 6 | -6/+6 |
* | | Fix bug #68567 (JSON_PARTIAL_OUTPUT_ON_ERROR can result in JSON with null key) | Jakub Zelenka | 2017-10-15 | 2 | -2/+21 |
* | | Prevent from being affected by local php.ini | Xinchen Hui | 2017-10-13 | 6 | -1/+11 |
* | | Reset utf8_invalid in json scanner | Jakub Zelenka | 2017-08-10 | 2 | -0/+2 |
* | | Fix possible overflow in json scanner utf8_invalid_count | Jakub Zelenka | 2017-08-10 | 2 | -4/+18 |
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Darek Slusarczyk | 2017-08-08 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge branch 'PHP-7.0' into PHP-7.1 | Darek Slusarczyk | 2017-08-08 | 1 | -1/+1 |
| |\ | |||||
| | * | JSON: fix config.w32 / Install headers on windows | Darek Slusarczyk | 2017-08-08 | 1 | -1/+1 |
* | | | Fix segfault in json ignoring of invalid UTF8 | Jakub Zelenka | 2017-08-06 | 3 | -1/+22 |
* | | | Bump PHP_JSON_VERSION to 1.6.0 | Jakub Zelenka | 2017-07-16 | 1 | -1/+1 |
* | | | [ci skip] Remove CSV leftovers from json code - $Id$ | Jakub Zelenka | 2017-07-16 | 3 | -6/+0 |
* | | | Introduce internal php_json_encode_ex to allow extensions setting depth | Jakub Zelenka | 2017-07-16 | 2 | -5/+9 |
* | | | Add JSON_INVALID_UTF8_SUBSTITUTE and JSON_INVALID_UTF8_IGNORE | Jakub Zelenka | 2017-07-16 | 9 | -198/+713 |
* | | | Avoid useless dereferences and separations during paramter passing. | Dmitry Stogov | 2017-06-19 | 1 | -1/+1 |
* | | | Optimization for fast path. | Dmitry Stogov | 2017-06-19 | 1 | -80/+83 |
* | | | Merge branch 'PHP-7.1' | Jakub Zelenka | 2017-06-18 | 3 | -695/+626 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Jakub Zelenka | 2017-06-18 | 3 | -695/+626 |
| |\ \ | | |/ | |||||
| | * | Regenerate and bump re2c version to 0.16 | Jakub Zelenka | 2017-06-18 | 3 | -642/+574 |
| | * | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-04 | 10 | -10/+10 |
| * | | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-04 | 10 | -10/+10 |
| * | | Install ext/json headers | Johannes Schlüter | 2016-12-07 | 1 | -1/+1 |
* | | | Fixed performance degradaton introduced in f6ac96b | Dmitry Stogov | 2017-06-13 | 1 | -17/+23 |
* | | | Improve and simplify UTF-8 validation in JSON | Jakub Zelenka | 2017-06-11 | 1 | -50/+16 |
* | | | Improved UTF-8 validation in JSON | Dmitry Stogov | 2017-05-25 | 1 | -27/+10 |
* | | | Don't suppress warnings in tests | Craig Duncan | 2017-04-02 | 3 | -6/+0 |
* | | | Allow JSON_OBJECT_AS_ARRAY option to actually have meaning | Sara Golemon | 2017-03-17 | 2 | -5/+36 |
* | | | 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 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2016-11-22 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | 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 |
* | | | 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 |
* | | | Merge branch 'PHP-7.1' | Dmitry Stogov | 2016-10-19 | 1 | -0/+4 |
|\ \ \ | |/ / | |||||
| * | | 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 |
|\ \ | |/ | |||||
| * | Merge branch 'PHP-5.6' into PHP-7.0 | Julien Pauli | 2016-09-19 | 2 | -1/+27 |
| |\ |