summaryrefslogtreecommitdiff
path: root/ext/json/json.c
Commit message (Expand)AuthorAgeFilesLines
* Update copyright headers to 2017Sammy Kaye Powers2017-01-041-1/+1
* remove TSRMLS_*Anatol Belski2016-11-211-2/+2
* Fix bug #73526 (php_json_encode depth issue)Jakub Zelenka2016-11-201-1/+1
* Merge branch 'PHP-5.6' into PHP-7.0Jakub Zelenka2016-08-141-0/+10
|\
| * Fixed bug #72787 (json_decode reads out of bounds)Jakub Zelenka2016-08-141-0/+6
* | Fixed bug #72069 (Behavior \JsonSerializable different from json_encode)Xinchen Hui2016-04-221-1/+1
* | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-031-1/+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
| * Merge branch 'PHP-5.5' into PHP-5.6Jakub Zelenka2015-02-221-17/+13
| |\
| | * Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are numbers p...Jakub Zelenka2015-02-221-11/+7
| * | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2015-02-041-1/+0
| |\ \ | | |/
| | * Revert "json_decode() should generate a syntax error when given ""."Julien Pauli2015-02-041-1/+0
* | | Simplify JSON constants registrationJakub Zelenka2015-09-041-26/+33
* | | Add my name to authors for previous refactoringJakub Zelenka2015-09-041-0/+1
* | | these need to be exported for extensions that use jsonJoe Watkins2015-09-031-1/+1
* | | Fix bug #62010 (json_decode produces invalid byte-sequences)Jakub Zelenka2015-06-281-0/+3
* | | Fix bug #68546 (json_decode cannot access property started with \0)Jakub Zelenka2015-06-211-0/+3
* | | made ZEND_TSRMLS_CACHE_* macros look like function callsAnatol Belski2015-02-161-2/+2
* | | fix datatype mismatchesAnatol Belski2015-02-091-3/+3
* | | Merge branch 'master' into jsondJakub Zelenka2015-02-021-0/+1
|\ \ \
| * \ \ Merge branch 'PHP-5.6'Adam Harvey2015-02-021-0/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2015-02-021-0/+1
| | |\ \ | | | |/
| | | * json_decode() should generate a syntax error when given "".Adam Harvey2015-02-021-0/+1
| | | * Bump yearXinchen Hui2015-01-151-1/+1
* | | | Merge branch 'master' into jsondJakub Zelenka2015-01-251-1/+9
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-01-191-8/+29
| |\ \ \ | | |/ /
| | * | Fixed bug #50224 where float without decimals were converted to integerJuan Basso2015-01-191-8/+29
| | * | bump yearXinchen Hui2015-01-151-1/+1
| * | | bump yearXinchen Hui2015-01-151-1/+1
| * | | trailing whitespace removalStanislav Malyshev2015-01-101-2/+2
* | | | Porting implementation of RFC json_preserve_fractional_partJuan Basso2015-01-121-0/+1
* | | | Merge branch 'master' into jsondJakub Zelenka2014-12-271-10/+15
|\ \ \ \ | |/ / /
| * | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-39/+39
| * | | ext/iconv, ext/json and ext/session use static tsrmls pointerAnatol Belski2014-10-171-0/+6
* | | | Fix compilation for json_encoderJakub Zelenka2014-11-301-2/+0
* | | | Add missing bits to php_json.hJakub Zelenka2014-11-251-2/+2
* | | | Move json encoding stuffJakub Zelenka2014-11-241-585/+8
|/ / /
* | | Fix ::jsonSerialize() failure messageNikita Popov2014-10-121-1/+1
* | | Move smart_str implementation into Zend/Nikita Popov2014-09-211-1/+1
* | | Use inline functions for most of smart_strNikita Popov2014-09-191-1/+1
* | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-191-1/+1
* | | Fixed useless or duplicated IS_INTERNED() checksDmitry Stogov2014-09-191-1/+1
* | | fix signatureAnatol Belski2014-08-271-1/+1
* | | 's' works with size_t round 3Anatol Belski2014-08-271-1/+1
* | | first show to make 's' work with size_tAnatol Belski2014-08-271-2/+2
* | | Improved performance of json_encode()Dmitry Stogov2014-08-271-29/+42
* | | master renames phase 1Anatol Belski2014-08-251-43/+43
* | | ported ext/jsonAnatol Belski2014-08-191-12/+12
* | | basic macro replacements, all at onceAnatol Belski2014-08-191-32/+32