Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Bump PHP_JSON_VERSION to 1.7.0 | Jakub Zelenka | 2018-06-14 | 1 | -1/+1 |
* | year++ | Xinchen Hui | 2018-01-02 | 1 | -1/+1 |
* | Merge JSON_THROW_ON_ERROR | Andrea Faulds | 2017-10-22 | 1 | -0/+1 |
* | 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 | 1 | -2/+0 |
* | Introduce internal php_json_encode_ex to allow extensions setting depth | Jakub Zelenka | 2017-07-16 | 1 | -1/+1 |
* | Add JSON_INVALID_UTF8_SUBSTITUTE and JSON_INVALID_UTF8_IGNORE | Jakub Zelenka | 2017-07-16 | 1 | -14/+18 |
* | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-02 | 1 | -1/+1 |
* | Bump PHP_JSON_VERSION to 1.5.0 | Jakub Zelenka | 2016-08-29 | 1 | -1/+1 |
* | Add return code from json API functions | Jakub Zelenka | 2016-06-28 | 1 | -4/+4 |
* | Merge branch 'PHP-7.0' | Nikita Popov | 2016-03-03 | 1 | -2/+2 |
|\ | |||||
| * | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE | Nikita Popov | 2016-03-03 | 1 | -1/+1 |
| * | Fix bug #71575 removing extra semicolons outside macros | James Titcumb | 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 |
* | | Move json_decode options macros bellow encode options | Jakub Zelenka | 2015-09-04 | 1 | -4/+4 |
* | | json: fix formating of PHP_JSON* option bitshifts | Ryan McCullagh | 2015-09-04 | 1 | -12/+12 |
* | | these need to be exported for extensions that use json | Joe Watkins | 2015-09-03 | 1 | -1/+1 |
* | | switch to the unified globals accessor where appropriate | Anatol Belski | 2015-07-29 | 1 | -7/+3 |
* | | Fix bug #68546 (json_decode cannot access property started with \0) | Jakub Zelenka | 2015-06-21 | 1 | -0/+1 |
* | | Set PHP_JSON_VERSION to 1.4.0 | Jakub Zelenka | 2015-02-17 | 1 | -1/+1 |
* | | fix json globals | Michael Wallner | 2015-02-09 | 1 | -0/+1 |
* | | Give me credit | Jakub Zelenka | 2015-02-02 | 1 | -0/+1 |
* | | Merge branch 'master' into jsond | Jakub Zelenka | 2015-01-25 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge branch 'PHP-5.6' | Stanislav Malyshev | 2015-01-19 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | Fixed bug #50224 where float without decimals were converted to integer | Juan Basso | 2015-01-19 | 1 | -0/+1 |
| | * | bump year | Xinchen Hui | 2015-01-15 | 1 | -1/+1 |
| | * | Export JsonSerializable Interface (bug #65753) | Julien Pauli | 2014-02-17 | 1 | -1/+1 |
| * | | bump year | Xinchen Hui | 2015-01-15 | 1 | -1/+1 |
* | | | 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 | -5/+9 |
|\ \ \ | |/ / | |||||
| * | | first shot remove TSRMLS_* things | Anatol Belski | 2014-12-13 | 1 | -4/+4 |
| * | | ext/iconv, ext/json and ext/session use static tsrmls pointer | Anatol Belski | 2014-10-17 | 1 | -1/+4 |
* | | | Add missing bits to php_json.h | Jakub Zelenka | 2014-11-25 | 1 | -14/+18 |
* | | | Add error codes to php_json.h | Jakub Zelenka | 2014-11-16 | 1 | -0/+13 |
|/ / | |||||
* | | Move smart_str implementation into Zend/ | Nikita Popov | 2014-09-21 | 1 | -1/+1 |
* | | s/PHP 5/PHP 7/ | Johannes Schlüter | 2014-09-19 | 1 | -1/+1 |
* | | fix signature | Anatol Belski | 2014-08-27 | 1 | -1/+1 |
* | | fix signature | Anatol Belski | 2014-08-27 | 1 | -1/+1 |
* | | master renames phase 1 | Anatol Belski | 2014-08-25 | 1 | -2/+2 |
* | | ported ext/json | Anatol Belski | 2014-08-19 | 1 | -2/+2 |
* | | Export JsonSerializable Interface (bug #65753) | Julien Pauli | 2014-02-17 | 1 | -1/+1 |
|/ | |||||
* | Bump year | Xinchen Hui | 2014-01-03 | 1 | -1/+1 |
* | Happy New Year | Xinchen Hui | 2013-01-01 | 1 | -1/+1 |
* | Add optional depth parameter to json_encode #62369 | Florian Anderiasch | 2012-07-24 | 1 | -0/+1 |
* | Merge branch 'PHP-5.3' into PHP-5.4 | Nikita Popov | 2012-06-23 | 1 | -0/+1 |
|\ | |||||
| * | Fix bug #61537 (json_encode() incorrectly truncates/discards information) and | Adam Harvey | 2012-04-11 | 1 | -0/+1 |
| * | - Year++ | Felipe Pena | 2012-01-01 | 1 | -1/+1 |
| * | - Year++ | Felipe Pena | 2011-01-01 | 1 | -1/+1 |