Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | year++ | Xinchen Hui | 2018-01-02 | 1 | -1/+1 |
* | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-04 | 1 | -1/+1 |
* | 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.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 |
* | | Introduce json encoder to fix globals related issues | Jakub Zelenka | 2016-10-30 | 1 | -14/+25 |
* | | Fix 73113 - Segfault with throwing JsonSerializable | Julien Pauli | 2016-09-19 | 1 | -1/+4 |
* | | Add initial failure checking for json_encode | Jakub Zelenka | 2016-08-29 | 1 | -3/+1 |
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Jakub Zelenka | 2016-08-14 | 1 | -0/+10 |
|\ \ | |/ | |||||
| * | Merge branch 'PHP-5.6' into PHP-7.0 | Jakub Zelenka | 2016-08-14 | 1 | -0/+10 |
| |\ | |||||
| | * | Fixed bug #72787 (json_decode reads out of bounds) | Jakub Zelenka | 2016-08-14 | 1 | -0/+6 |
* | | | Add return code from json API functions | Jakub Zelenka | 2016-06-28 | 1 | -3/+8 |
* | | | Use one place to define max length of double | Jakub Zelenka | 2016-06-26 | 1 | -8/+0 |
* | | | Replace json.precision with serialize_precision | Jakub Zelenka | 2016-06-26 | 1 | -38/+1 |
* | | | Add JSON_G(precision) | Yasuo Ohgaki | 2016-06-26 | 1 | -1/+38 |
* | | | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-04-22 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Fixed bug #72069 (Behavior \JsonSerializable different from json_encode) | Xinchen Hui | 2016-04-22 | 1 | -1/+1 |
* | | | Merge branch 'PHP-7.0' | Nikita Popov | 2016-03-03 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE | Nikita Popov | 2016-03-03 | 1 | -1/+1 |
* | | | json_encode: Escape U+2028 and U+2029 more often. | Eddie Kohler | 2016-01-22 | 1 | -0/+1 |
|/ / | |||||
* | | Merge branch 'PHP-5.6' into PHP-7.0 | Lior Kaplan | 2016-01-01 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Happy new year (Update copyright to 2016) | Lior Kaplan | 2016-01-01 | 1 | -1/+1 |
| * | Merge branch 'PHP-5.5' into PHP-5.6 | Jakub Zelenka | 2015-02-22 | 1 | -17/+13 |
| |\ | |||||
| | * | Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are numbers p... | Jakub Zelenka | 2015-02-22 | 1 | -11/+7 |
| * | | Merge branch 'PHP-5.5' into PHP-5.6 | Julien Pauli | 2015-02-04 | 1 | -1/+0 |
| |\ \ | | |/ | |||||
| | * | Revert "json_decode() should generate a syntax error when given ""." | Julien Pauli | 2015-02-04 | 1 | -1/+0 |
* | | | Simplify JSON constants registration | Jakub Zelenka | 2015-09-04 | 1 | -26/+33 |
* | | | Add my name to authors for previous refactoring | Jakub Zelenka | 2015-09-04 | 1 | -0/+1 |
* | | | these need to be exported for extensions that use json | Joe Watkins | 2015-09-03 | 1 | -1/+1 |
* | | | Fix bug #62010 (json_decode produces invalid byte-sequences) | Jakub Zelenka | 2015-06-28 | 1 | -0/+3 |
* | | | Fix bug #68546 (json_decode cannot access property started with \0) | Jakub Zelenka | 2015-06-21 | 1 | -0/+3 |
* | | | made ZEND_TSRMLS_CACHE_* macros look like function calls | Anatol Belski | 2015-02-16 | 1 | -2/+2 |
* | | | fix datatype mismatches | Anatol Belski | 2015-02-09 | 1 | -3/+3 |
* | | | Merge branch 'master' into jsond | Jakub Zelenka | 2015-02-02 | 1 | -0/+1 |
|\ \ \ | |||||
| * \ \ | Merge branch 'PHP-5.6' | Adam Harvey | 2015-02-02 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'PHP-5.5' into PHP-5.6 | Adam Harvey | 2015-02-02 | 1 | -0/+1 |
| | |\ \ | | | |/ | |||||
| | | * | json_decode() should generate a syntax error when given "". | Adam Harvey | 2015-02-02 | 1 | -0/+1 |
| | | * | Bump year | Xinchen Hui | 2015-01-15 | 1 | -1/+1 |
* | | | | Merge branch 'master' into jsond | Jakub Zelenka | 2015-01-25 | 1 | -1/+9 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.6' | Stanislav Malyshev | 2015-01-19 | 1 | -8/+29 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed bug #50224 where float without decimals were converted to integer | Juan Basso | 2015-01-19 | 1 | -8/+29 |
| | * | | bump year | Xinchen Hui | 2015-01-15 | 1 | -1/+1 |
| * | | | bump year | Xinchen Hui | 2015-01-15 | 1 | -1/+1 |
| * | | | trailing whitespace removal | Stanislav Malyshev | 2015-01-10 | 1 | -2/+2 |
* | | | | Porting implementation of RFC json_preserve_fractional_part | Juan Basso | 2015-01-12 | 1 | -0/+1 |
* | | | | Merge branch 'master' into jsond | Jakub Zelenka | 2014-12-27 | 1 | -10/+15 |
|\ \ \ \ | |/ / / | |||||
| * | | | first shot remove TSRMLS_* things | Anatol Belski | 2014-12-13 | 1 | -39/+39 |
| * | | | ext/iconv, ext/json and ext/session use static tsrmls pointer | Anatol Belski | 2014-10-17 | 1 | -0/+6 |
* | | | | Fix compilation for json_encoder | Jakub Zelenka | 2014-11-30 | 1 | -2/+0 |