summaryrefslogtreecommitdiff
path: root/ext/json/json.c
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | which also comply with the current semantics for such macros
* 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
| | | | | | | | | | | | | | | | | | | | Fixes bug #68938 (json_decode() decodes empty string without error). Patch by jeremy at bat-country dot us.
| | | * Bump yearXinchen Hui2015-01-151-1/+1
| | | |
* | | | Merge branch 'master' into jsondJakub Zelenka2015-01-251-1/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: ext/json/JSON_parser.c ext/json/json.c
| * | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-01-191-8/+29
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-5.6: Fixed bug #50224 where float without decimals were converted to integer Updated NEWS for #68371
| | * | 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
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/json/JSON_parser.c ext/json/JSON_parser.h ext/json/config.m4 ext/json/config.w32 ext/json/json.c ext/json/php_json.h
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | So we can use it there as well... For now I've retained the zend_smart_str_public.h header, though it would probably be better to just move that one struct into zend_types.h.
* | | Use inline functions for most of smart_strNikita Popov2014-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | smart_str_free_ex no longer exists, always use smart_str_free instead. smart_str_alloc no longer requires a newlen variable to be in scope, instead it returns the new length.
* | | 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
| | |
* | | Merge branch 'PHP-5.6'Lior Kaplan2014-08-171-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.6: typofixes Conflicts: ext/spl/php_spl.c
| * | Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2014-08-171-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.5: typofixes
| | * Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-08-171-1/+1
| | |\ | | | | | | | | | | | | | | | | * PHP-5.4: typofixes
| | | * 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 ↵Dmitry Stogov2014-05-291-2/+2
| | | | | | | | | | | | | | | | directly from SHM.
* | | | Fixed Reference handling in xml_parse_into_structXinchen Hui2014-05-051-3/+0
| | | |
* | | | Port JSONNikita Popov2014-05-051-114/+97
| | | |
* | | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-04-131-8/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.6: Fix #66021 (Blank line inside empty array/object)
| * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-131-8/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.5: Fix #66021 (Blank line inside empty array/object)
| | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-131-8/+10
| | |\ \ | | | |/ | | | | | | | | | | | | * PHP-5.4: Fix #66021 (Blank line inside empty array/object)
| | | * Merge branch 'pull-request/518' into PHP-5.4Stanislav Malyshev2014-04-131-8/+10
| | | |\ | | | | | | | | | | | | | | | | | | | | * pull-request/518: Fix #66021 (Blank line inside empty array/object)
| | | | * Fix #66021 (Blank line inside empty array/object)Kevin Israel2013-11-021-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed json_encode() so that when the JSON_PRETTY_PRINT option is specified, the pair of linefeeds immediately after an opening bracket and before the corresponding closing bracket is omitted when the array or object contains no elements or accessible properties (and hence would have a blank line between the brackets).
| | * | | Merge branch 'PHP-5.4' into PHP-5.5Julien Pauli2014-02-171-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * PHP-5.4: Export JsonSerializable Interface (bug #65753)
| | | * | Export JsonSerializable Interface (bug #65753)Julien Pauli2014-02-171-1/+1
| | | | |
| | | * | Bump yearXinchen Hui2014-01-031-1/+1
| | | | |
View Lorry Controller Status