summaryrefslogtreecommitdiff
path: root/ext/json
Commit message (Expand)AuthorAgeFilesLines
* 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-163-6/+0
* Introduce internal php_json_encode_ex to allow extensions setting depthJakub Zelenka2017-07-162-5/+9
* Add JSON_INVALID_UTF8_SUBSTITUTE and JSON_INVALID_UTF8_IGNOREJakub Zelenka2017-07-169-198/+713
* Avoid useless dereferences and separations during paramter passing.Dmitry Stogov2017-06-191-1/+1
* Optimization for fast path.Dmitry Stogov2017-06-191-80/+83
* Merge branch 'PHP-7.1'Jakub Zelenka2017-06-183-695/+626
|\
| * Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2017-06-183-695/+626
| |\
| | * Regenerate and bump re2c version to 0.16Jakub Zelenka2017-06-183-642/+574
| | * Update copyright headers to 2017Sammy Kaye Powers2017-01-0410-10/+10
| * | Update copyright headers to 2017Sammy Kaye Powers2017-01-0410-10/+10
| * | Install ext/json headersJohannes Schlüter2016-12-071-1/+1
* | | Fixed performance degradaton introduced in f6ac96bDmitry Stogov2017-06-131-17/+23
* | | Improve and simplify UTF-8 validation in JSONJakub Zelenka2017-06-111-50/+16
* | | Improved UTF-8 validation in JSONDmitry Stogov2017-05-251-27/+10
* | | Don't suppress warnings in testsCraig Duncan2017-04-023-6/+0
* | | Allow JSON_OBJECT_AS_ARRAY option to actually have meaningSara Golemon2017-03-172-5/+36
* | | add nmakefile fragment for jsonAnatol Belski2017-01-042-0/+8
* | | Update copyright headers to 2017Sammy Kaye Powers2017-01-0210-10/+10
* | | Use new param API in jsonSara Golemon2016-12-311-6/+13
* | | Merge branch 'PHP-7.1'Anatol Belski2016-11-221-2/+2
|\ \ \ | |/ /
| * | 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.1'Jakub Zelenka2016-11-201-1/+1
|\ \ \ | |/ /
| * | 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
* | | json_encode(): Detect recursion earlierNikita Popov2016-11-194-24/+19
* | | Merge branch 'PHP-7.1'Jakub Zelenka2016-10-305-47/+116
|\ \ \ | |/ /
| * | Introduce json encoder to fix globals related issuesJakub Zelenka2016-10-305-47/+116
* | | Merge branch 'PHP-7.1'Dmitry Stogov2016-10-191-0/+4
|\ \ \ | |/ /
| * | Introduced HT_IS_PACKED() and HT_IS_WITHOUT_HOLES() macros. (Benjamin Coutu)Dmitry Stogov2016-10-191-0/+4
* | | Install ext/json headers so that other extension can parse, tooJohannes Schlüter2016-10-181-1/+1
|/ /
* | Merge branch 'PHP-7.0' into PHP-7.1Julien Pauli2016-09-193-2/+27
|\ \ | |/
| * Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2016-09-192-1/+27
| |\
| | * Do not wrap user exception in case of custom JSON serializationJulien Pauli2016-09-192-1/+27
* | | Fix 73113 - Segfault with throwing JsonSerializableJulien Pauli2016-09-191-1/+4
* | | Bump PHP_JSON_VERSION to 1.5.0Jakub Zelenka2016-08-291-1/+1
* | | Add test for fixed bug #68992Jakub Zelenka2016-08-291-0/+30
* | | Fix recursion and protection in the failed JSON encodingJakub Zelenka2016-08-291-11/+20
* | | Add initial failure checking for json_encodeJakub Zelenka2016-08-293-42/+56
* | | Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2016-08-142-0/+25
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Jakub Zelenka2016-08-142-0/+25
| |\ \ | | |/
| | * Fixed bug #72787 (json_decode reads out of bounds)Jakub Zelenka2016-08-142-0/+21
| * | Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)"Xinchen Hui2016-05-062-77/+38
| * | Fixed bug #72170 (JsonSerializable may inc apply count without dec it)Xinchen Hui2016-05-062-38/+77
* | | Add return code from json API functionsJakub Zelenka2016-06-282-7/+12
* | | Use one place to define max length of doubleJakub Zelenka2016-06-262-18/+2
* | | Replace json.precision with serialize_precisionJakub Zelenka2016-06-263-40/+2
* | | Add castYasuo Ohgaki2016-06-261-1/+1
* | | Simply use ndigit for flag for zend_dtoa modeYasuo Ohgaki2016-06-261-5/+2