| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-04 | 1 | -1/+1 |
| | | |||||
| * | remove TSRMLS_* | Anatol Belski | 2016-11-21 | 1 | -2/+2 |
| | | |||||
| * | Fix bug #73526 (php_json_encode depth issue) | Jakub Zelenka | 2016-11-20 | 1 | -1/+1 |
| | | |||||
| * | 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 |
| | | | |||||
| * | | Fixed bug #72069 (Behavior \JsonSerializable different from json_encode) | Xinchen Hui | 2016-04-22 | 1 | -1/+1 |
| | | | |||||
| * | | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE | Nikita Popov | 2016-03-03 | 1 | -1/+1 |
| | | | | | | | | | Also re bug #71575. | ||||
| * | | 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 |
| | | | | | |||||
| | | * | | bump year | Xinchen Hui | 2015-01-15 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | bump year | Xinchen Hui | 2015-01-15 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | trailing whitespace removal | Stanislav Malyshev | 2015-01-10 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Porting implementation of RFC json_preserve_fractional_part | Juan Basso | 2015-01-12 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into jsond | Jakub Zelenka | 2014-12-27 | 1 | -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_* things | Anatol Belski | 2014-12-13 | 1 | -39/+39 |
| | | | | | |||||
| | * | | | ext/iconv, ext/json and ext/session use static tsrmls pointer | Anatol Belski | 2014-10-17 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | Fix compilation for json_encoder | Jakub Zelenka | 2014-11-30 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | Add missing bits to php_json.h | Jakub Zelenka | 2014-11-25 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Move json encoding stuff | Jakub Zelenka | 2014-11-24 | 1 | -585/+8 |
| |/ / / | |||||
| * | | | Fix ::jsonSerialize() failure message | Nikita Popov | 2014-10-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Move smart_str implementation into Zend/ | Nikita Popov | 2014-09-21 | 1 | -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_str | Nikita Popov | 2014-09-19 | 1 | -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üter | 2014-09-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed useless or duplicated IS_INTERNED() checks | Dmitry Stogov | 2014-09-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix signature | Anatol Belski | 2014-08-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | 's' works with size_t round 3 | Anatol Belski | 2014-08-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | first show to make 's' work with size_t | Anatol Belski | 2014-08-27 | 1 | -2/+2 |
| | | | | |||||
| * | | | Improved performance of json_encode() | Dmitry Stogov | 2014-08-27 | 1 | -29/+42 |
| | | | | |||||
| * | | | master renames phase 1 | Anatol Belski | 2014-08-25 | 1 | -43/+43 |
| | | | | |||||
| * | | | ported ext/json | Anatol Belski | 2014-08-19 | 1 | -12/+12 |
| | | | | |||||
| * | | | basic macro replacements, all at once | Anatol Belski | 2014-08-19 | 1 | -32/+32 |
| | | | | |||||
 |
index : delta/php-git.git | |
| git.php.net: repository/php-src.git |
| summaryrefslogtreecommitdiff |