summaryrefslogtreecommitdiff
path: root/ext/json/json.c
Commit message (Expand)AuthorAgeFilesLines
* [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-4/+8
* Add JSON_INVALID_UTF8_SUBSTITUTE and JSON_INVALID_UTF8_IGNOREJakub Zelenka2017-07-161-0/+4
* Avoid useless dereferences and separations during paramter passing.Dmitry Stogov2017-06-191-1/+1
* Allow JSON_OBJECT_AS_ARRAY option to actually have meaningSara Golemon2017-03-171-5/+8
* Update copyright headers to 2017Sammy Kaye Powers2017-01-021-1/+1
* Use new param API in jsonSara Golemon2016-12-311-6/+13
* Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-11-221-2/+2
|\
| * remove TSRMLS_*Anatol Belski2016-11-211-2/+2
* | Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2016-11-201-1/+1
|\ \ | |/
| * Fix bug #73526 (php_json_encode depth issue)Jakub Zelenka2016-11-201-1/+1
* | Introduce json encoder to fix globals related issuesJakub Zelenka2016-10-301-14/+25
* | Fix 73113 - Segfault with throwing JsonSerializableJulien Pauli2016-09-191-1/+4
* | Add initial failure checking for json_encodeJakub Zelenka2016-08-291-3/+1
* | Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2016-08-141-0/+10
|\ \ | |/
| * 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
* | | Add return code from json API functionsJakub Zelenka2016-06-281-3/+8
* | | Use one place to define max length of doubleJakub Zelenka2016-06-261-8/+0
* | | Replace json.precision with serialize_precisionJakub Zelenka2016-06-261-38/+1
* | | Add JSON_G(precision)Yasuo Ohgaki2016-06-261-1/+38
* | | Merge branch 'PHP-7.0'Xinchen Hui2016-04-221-1/+1
|\ \ \ | |/ /
| * | Fixed bug #72069 (Behavior \JsonSerializable different from json_encode)Xinchen Hui2016-04-221-1/+1
* | | Merge branch 'PHP-7.0'Nikita Popov2016-03-031-1/+1
|\ \ \ | |/ /
| * | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-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
| * 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