| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Use int instead of long in protos | Gabriel Caruso | 2018-02-23 | 1 | -1/+1 |
| | | |||||
| * | year++ | Xinchen Hui | 2018-01-02 | 1 | -1/+1 |
| | | |||||
| * | Merge JSON_THROW_ON_ERROR | Andrea Faulds | 2017-10-22 | 1 | -34/+63 |
| | | |||||
| * | [ci skip] Remove CSV leftovers from json code - $Id$ | Jakub Zelenka | 2017-07-16 | 1 | -2/+0 |
| | | |||||
| * | Introduce internal php_json_encode_ex to allow extensions setting depth | Jakub Zelenka | 2017-07-16 | 1 | -4/+8 |
| | | |||||
| * | Add JSON_INVALID_UTF8_SUBSTITUTE and JSON_INVALID_UTF8_IGNORE | Jakub Zelenka | 2017-07-16 | 1 | -0/+4 |
| | | | | | | It implements request #65082 and adds options for replacing resp. ignoring invalid UTF-8 sequences for json_encode and json_decode. | ||||
| * | Avoid useless dereferences and separations during paramter passing. | Dmitry Stogov | 2017-06-19 | 1 | -1/+1 |
| | | |||||
| * | Allow JSON_OBJECT_AS_ARRAY option to actually have meaning | Sara Golemon | 2017-03-17 | 1 | -5/+8 |
| | | | | | | | | | | Options can only be passed if $assoc is passed, but passing assoc clobbers any attempt to pass JSON_OBJECT_AS_ARRAY as an option. Allow the option to occur in the options field by handling "null" as default/use-options. | ||||
| * | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-02 | 1 | -1/+1 |
| | | |||||
| * | Use new param API in json | Sara Golemon | 2016-12-31 | 1 | -6/+13 |
| | | |||||
| * | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2016-11-22 | 1 | -2/+2 |
| |\ | | | | | | | | | * PHP-7.0: remove TSRMLS_* | ||||
| | * | remove TSRMLS_* | Anatol Belski | 2016-11-21 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Jakub Zelenka | 2016-11-20 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Fix bug #73526 (php_json_encode depth issue) | Jakub Zelenka | 2016-11-20 | 1 | -1/+1 |
| | | | |||||
| * | | Introduce json encoder to fix globals related issues | Jakub Zelenka | 2016-10-30 | 1 | -14/+25 |
| | | | | | | | | | | | | | It fixes bugs #66025 and #73254 by replacing globals with a passed structure holding depth and error code. In addition it fixes #72069 in a more generic way. | ||||
| * | | Fix 73113 - Segfault with throwing JsonSerializable | Julien Pauli | 2016-09-19 | 1 | -1/+4 |
| | | | |||||
| * | | Add initial failure checking for json_encode | Jakub Zelenka | 2016-08-29 | 1 | -3/+1 |
| | | | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Jakub Zelenka | 2016-08-14 | 1 | -0/+10 |
| |\ \ | |/ | |||||
| | * | Merge branch 'PHP-5.6' into PHP-7.0 | Jakub Zelenka | 2016-08-14 | 1 | -0/+10 |
| | |\ | |||||
| | | * | Fixed bug #72787 (json_decode reads out of bounds) | Jakub Zelenka | 2016-08-14 | 1 | -0/+6 |
| | | | | |||||
| * | | | Add return code from json API functions | Jakub Zelenka | 2016-06-28 | 1 | -3/+8 |
| | | | | | | | | | | | | | It will allow fix few json bugs in a better way | ||||
| * | | | Use one place to define max length of double | Jakub Zelenka | 2016-06-26 | 1 | -8/+0 |
| | | | | | | | | | | | | | Introduce new constant PHP_DOUBLE_MAX_LENGTH for that purpose | ||||
| * | | | Replace json.precision with serialize_precision | Jakub Zelenka | 2016-06-26 | 1 | -38/+1 |
| | | | | |||||
| * | | | Add JSON_G(precision) | Yasuo Ohgaki | 2016-06-26 | 1 | -1/+38 |
| | | | | |||||
| * | | | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-04-22 | 1 | -1/+1 |
| |\ \ \ | |/ / | |||||
| | * | | Fixed bug #72069 (Behavior \JsonSerializable different from json_encode) | Xinchen Hui | 2016-04-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'PHP-7.0' | Nikita Popov | 2016-03-03 | 1 | -1/+1 |
| |\ \ \ | |/ / | |||||
| | * | | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE | Nikita Popov | 2016-03-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | Also re bug #71575. | ||||
| * | | | json_encode: Escape U+2028 and U+2029 more often. | Eddie Kohler | 2016-01-22 | 1 | -0/+1 |
| |/ / | | | | | | | | | | | | | | | | | These characters are illegal in Javascript, so leaving them unescaped is risky. The default encoder ($flags = 0) is fine, but the encoder with JSON_UNESCAPED_UNICODE flag is not. In case anyone wants the ability to leave these characters unescaped, provide JSON_UNESCAPED_LINE_TERMINATORS. | ||||
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | Lior Kaplan | 2016-01-01 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016) | ||||
| | * | Happy new year (Update copyright to 2016) | Lior Kaplan | 2016-01-01 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'PHP-5.5' into PHP-5.6 | Jakub Zelenka | 2015-02-22 | 1 | -17/+13 |
| | |\ | | | | | | | | | | | | | Conflicts: ext/json/json.c | ||||
| | | * | Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are numbers ↵ | Jakub Zelenka | 2015-02-22 | 1 | -11/+7 |
| | | | | | | | | | | | | | plus the letter e) | ||||
| | * | | Merge branch 'PHP-5.5' into PHP-5.6 | Julien Pauli | 2015-02-04 | 1 | -1/+0 |
| | |\ \ | | |/ | | | | | | | | | | | | | * PHP-5.5: Revert "json_decode() should generate a syntax error when given ""." Update NEWS | ||||
| | | * | Revert "json_decode() should generate a syntax error when given ""." | Julien Pauli | 2015-02-04 | 1 | -1/+0 |
| | | | | | | | | | | | | | This reverts commit a7b3abe4e6f5e2fdfd8d55b676c9ca6b3f9c8cc8. | ||||
| * | | | Simplify JSON constants registration | Jakub Zelenka | 2015-09-04 | 1 | -26/+33 |
| | | | | |||||
| * | | | Add my name to authors for previous refactoring | Jakub Zelenka | 2015-09-04 | 1 | -0/+1 |
| | | | | | | | | | | | | | Related to jsond changes | ||||
| * | | | these need to be exported for extensions that use json | Joe Watkins | 2015-09-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix bug #62010 (json_decode produces invalid byte-sequences) | Jakub Zelenka | 2015-06-28 | 1 | -0/+3 |
| | | | | |||||
| * | | | Fix bug #68546 (json_decode cannot access property started with \0) | Jakub Zelenka | 2015-06-21 | 1 | -0/+3 |
| | | | | |||||
| * | | | made ZEND_TSRMLS_CACHE_* macros look like function calls | Anatol Belski | 2015-02-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | which also comply with the current semantics for such macros | ||||
| * | | | fix datatype mismatches | Anatol Belski | 2015-02-09 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'master' into jsond | Jakub Zelenka | 2015-02-02 | 1 | -0/+1 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'PHP-5.6' | Adam Harvey | 2015-02-02 | 1 | -0/+1 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Merge branch 'PHP-5.5' into PHP-5.6 | Adam Harvey | 2015-02-02 | 1 | -0/+1 |
| | | |\ \ | | | |/ | |||||
| | | | * | json_decode() should generate a syntax error when given "". | Adam Harvey | 2015-02-02 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | Fixes bug #68938 (json_decode() decodes empty string without error). Patch by jeremy at bat-country dot us. | ||||
| | | | * | Bump year | Xinchen Hui | 2015-01-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into jsond | Jakub Zelenka | 2015-01-25 | 1 | -1/+9 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | Conflicts: ext/json/JSON_parser.c ext/json/json.c | ||||
| | * | | | Merge branch 'PHP-5.6' | Stanislav Malyshev | 2015-01-19 | 1 | -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 integer | Juan Basso | 2015-01-19 | 1 | -8/+29 |
| | | | | | |||||
 |
index : delta/php-git.git | |
| git.php.net: repository/php-src.git |
| summaryrefslogtreecommitdiff |