summaryrefslogtreecommitdiff
path: root/ext/json
Commit message (Expand)AuthorAgeFilesLines
* bump yearXinchen Hui2015-01-152-2/+2
* Fix bug #68817: Null pointer deferenceStanislav Malyshev2015-01-142-1/+18
* trailing whitespace removalStanislav Malyshev2015-01-104-16/+16
* first shot remove TSRMLS_* thingsAnatol Belski2014-12-134-59/+59
* fix arg order, CFLAGS is the fifth arg in m4Anatol Belski2014-10-171-1/+1
* ext/iconv, ext/json and ext/session use static tsrmls pointerAnatol Belski2014-10-174-3/+12
* Fix ::jsonSerialize() failure messageNikita Popov2014-10-121-1/+1
* removed *.dsw and *.dsp filesAnatol Belski2014-09-281-135/+0
* Move smart_str implementation into Zend/Nikita Popov2014-09-213-3/+3
* Use inline functions for most of smart_strNikita Popov2014-09-191-1/+1
* s/PHP 5/PHP 7/Johannes Schlüter2014-09-192-2/+2
* Fixed useless or duplicated IS_INTERNED() checksDmitry Stogov2014-09-191-1/+1
* reduce struct size by 8 byte on 64 bitAnatol Belski2014-09-171-1/+1
* fix signatureAnatol Belski2014-08-272-2/+2
* 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
* fix strtol callAnatol Belski2014-08-261-1/+1
* master renames phase 1Anatol Belski2014-08-253-54/+54
* ported ext/jsonAnatol Belski2014-08-193-15/+15
* basic macro replacements, all at onceAnatol Belski2014-08-192-40/+40
* Merge branch 'PHP-5.6'Lior Kaplan2014-08-171-1/+1
|\
| * Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2014-08-171-1/+1
| |\
| | * Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-08-171-1/+1
| | |\
| | | * typofixesVeres Lajos2014-08-171-1/+1
* | | | Use reference counting instead of zval duplicationDmitry Stogov2014-06-051-1/+1
* | | | Introduced immutable arrays. They don't need to be copyed and may be used dir...Dmitry Stogov2014-05-291-2/+2
* | | | Fix length reset in JSON parserNikita Popov2014-05-291-1/+1
* | | | Fix ZTSNikita Popov2014-05-051-4/+4
* | | | Fixed Reference handling in xml_parse_into_structXinchen Hui2014-05-051-3/+0
* | | | Port JSONNikita Popov2014-05-054-202/+181
* | | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-04-132-8/+30
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-132-8/+30
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-132-8/+30
| | |\ \ | | | |/
| | | * Merge branch 'pull-request/518' into PHP-5.4Stanislav Malyshev2014-04-132-8/+30
| | | |\
| | | | * Fix #66021 (Blank line inside empty array/object)Kevin Israel2013-11-022-8/+30
| | * | | Merge branch 'PHP-5.4' into PHP-5.5Julien Pauli2014-02-172-2/+2
| | |\ \ \ | | | |/ /
| | | * | Export JsonSerializable Interface (bug #65753)Julien Pauli2014-02-172-2/+2
| | | * | Bump yearXinchen Hui2014-01-032-2/+2
| | * | | Bump yearXinchen Hui2014-01-032-2/+2
| * | | | Export JsonSerializable Interface (bug #65753)Julien Pauli2014-02-172-2/+2
* | | | | Export JsonSerializable Interface (bug #65753)Julien Pauli2014-02-172-2/+2
* | | | | Merge branch 'PHP-5.6'Xinchen Hui2014-01-032-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Bump yearXinchen Hui2014-01-032-2/+2
* | | | | Merge branch 'PHP-5.6'kovacs.ferenc2013-11-182-3/+72
|\ \ \ \ \ | |/ / / /
| * | | | Fixed case part of bug #64874 ("json_decode handles whitespace and case-sensi...Andrea Faulds2013-11-112-3/+72
| |/ / /
* | | | Merge branch 'PHP-5.6'Adam Harvey2013-11-102-8/+139
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2013-11-102-8/+139
| |\ \ \ | | |/ /
| | * | Better test: Check combined leading/trailingAndrea Faulds2013-10-151-0/+66