summaryrefslogtreecommitdiff
path: root/ext/json/php_json.h
Commit message (Expand)AuthorAgeFilesLines
* Constify char * arguments of APIstwosee2020-06-081-2/+2
* Remove mention of PHP major version in Copyright headersGabriel Caruso2019-09-251-2/+0
* Bump PHP_JSON_VERSION to PHP_VERSIONPeter Kokot2019-07-241-1/+3
* Remove local variablesPeter Kokot2019-02-031-9/+0
* Remove yearly range from copyright noticeZeev Suraski2019-01-301-1/+1
* Bump PHP_JSON_VERSION to 1.7.0Jakub Zelenka2018-06-141-1/+1
* year++Xinchen Hui2018-01-021-1/+1
* Merge JSON_THROW_ON_ERRORAndrea Faulds2017-10-221-0/+1
* Bump PHP_JSON_VERSION to 1.6.0Jakub Zelenka2017-07-161-1/+1
* [ci skip] Remove CSV leftovers from json code - $Id$Jakub Zelenka2017-07-161-2/+0
* Introduce internal php_json_encode_ex to allow extensions setting depthJakub Zelenka2017-07-161-1/+1
* Add JSON_INVALID_UTF8_SUBSTITUTE and JSON_INVALID_UTF8_IGNOREJakub Zelenka2017-07-161-14/+18
* Update copyright headers to 2017Sammy Kaye Powers2017-01-021-1/+1
* Bump PHP_JSON_VERSION to 1.5.0Jakub Zelenka2016-08-291-1/+1
* Add return code from json API functionsJakub Zelenka2016-06-281-4/+4
* Merge branch 'PHP-7.0'Nikita Popov2016-03-031-2/+2
|\
| * Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-031-1/+1
| * 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-221-0/+1
|/
* Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-011-1/+1
|\
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-011-1/+1
* | Move json_decode options macros bellow encode optionsJakub Zelenka2015-09-041-4/+4
* | json: fix formating of PHP_JSON* option bitshiftsRyan McCullagh2015-09-041-12/+12
* | these need to be exported for extensions that use jsonJoe Watkins2015-09-031-1/+1
* | switch to the unified globals accessor where appropriateAnatol Belski2015-07-291-7/+3
* | Fix bug #68546 (json_decode cannot access property started with \0)Jakub Zelenka2015-06-211-0/+1
* | Set PHP_JSON_VERSION to 1.4.0Jakub Zelenka2015-02-171-1/+1
* | fix json globalsMichael Wallner2015-02-091-0/+1
* | Give me creditJakub Zelenka2015-02-021-0/+1
* | Merge branch 'master' into jsondJakub Zelenka2015-01-251-1/+1
|\ \
| * \ Merge branch 'PHP-5.6'Stanislav Malyshev2015-01-191-0/+1
| |\ \ | | |/
| | * Fixed bug #50224 where float without decimals were converted to integerJuan Basso2015-01-191-0/+1
| | * bump yearXinchen Hui2015-01-151-1/+1
| | * Export JsonSerializable Interface (bug #65753)Julien Pauli2014-02-171-1/+1
| * | bump yearXinchen Hui2015-01-151-1/+1
* | | Porting implementation of RFC json_preserve_fractional_partJuan Basso2015-01-121-0/+1
* | | Merge branch 'master' into jsondJakub Zelenka2014-12-271-5/+9
|\ \ \ | |/ /
| * | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-4/+4
| * | ext/iconv, ext/json and ext/session use static tsrmls pointerAnatol Belski2014-10-171-1/+4
* | | Add missing bits to php_json.hJakub Zelenka2014-11-251-14/+18
* | | Add error codes to php_json.hJakub Zelenka2014-11-161-0/+13
|/ /
* | Move smart_str implementation into Zend/Nikita Popov2014-09-211-1/+1
* | s/PHP 5/PHP 7/Johannes Schlüter2014-09-191-1/+1
* | fix signatureAnatol Belski2014-08-271-1/+1
* | fix signatureAnatol Belski2014-08-271-1/+1
* | master renames phase 1Anatol Belski2014-08-251-2/+2
* | ported ext/jsonAnatol Belski2014-08-191-2/+2
* | Export JsonSerializable Interface (bug #65753)Julien Pauli2014-02-171-1/+1
|/
* Bump yearXinchen Hui2014-01-031-1/+1
* Happy New YearXinchen Hui2013-01-011-1/+1