Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Improved php_json_escape_string() | Dmitry Stogov | 2015-03-11 | 1 | -98/+103 | |
| | ||||||
* | Merge branch 'PHP-5.6' | Jakub Zelenka | 2015-02-22 | 1 | -17/+24 | |
| | | | | The fix for master is a bit different (it's fixed in encoder) | |||||
* | fix json globals | Michael Wallner | 2015-02-09 | 1 | -2/+0 | |
| | ||||||
* | size_t vs int | Anatol Belski | 2015-02-09 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'master' into jsond | Jakub Zelenka | 2015-02-08 | 1 | -1/+1 | |
| | | | | | Conflicts: ext/json/json.c | |||||
* | Give me credit | Jakub Zelenka | 2015-02-02 | 1 | -0/+1 | |
| | ||||||
* | Merge branch 'master' into jsond | Jakub Zelenka | 2015-01-25 | 1 | -1/+1 | |
| | | | | | | Conflicts: ext/json/JSON_parser.c ext/json/json.c | |||||
* | Increase PHP_JSON_DOUBLE_MAX_LENGTH for fractional part | Jakub Zelenka | 2015-01-18 | 1 | -2/+2 | |
| | | | | | | This is probably not necessary as such number is not realistic. It's just to be consistent with jsond extension. | |||||
* | Porting implementation of RFC json_preserve_fractional_part | Juan Basso | 2015-01-12 | 1 | -3/+8 | |
| | ||||||
* | Refactore json double encoding to use php_gcvt | Jakub Zelenka | 2015-01-11 | 1 | -23/+25 | |
| | ||||||
* | Replace encoder functions json prefix with php_json | Jakub Zelenka | 2015-01-10 | 1 | -25/+25 | |
| | ||||||
* | Merge branch 'master' into jsond | Jakub Zelenka | 2014-12-27 | 1 | -34/+34 | |
| | | | | | | | | | | 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 | |||||
* | Fix compilation for json_encoder | Jakub Zelenka | 2014-11-30 | 1 | -0/+4 | |
| | ||||||
* | Move json encoding stuff | Jakub Zelenka | 2014-11-24 | 1 | -0/+537 | |