Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵ | Dmitry Stogov | 2015-06-30 | 7 | -1033/+1152 |
| | | | | semantick changes). | ||||
* | Fix incompatible JSON errors | Jakub Zelenka | 2015-06-28 | 3 | -486/+662 |
| | | | | | | | This fixes differences in error codes with PHP 5 and 7. The malformed UTF-8 and control character error codes are now returned even in non-string context which makes it the same as it was in PHP 5 json ext. | ||||
* | Fix bug #62010 (json_decode produces invalid byte-sequences) | Jakub Zelenka | 2015-06-28 | 4 | -209/+250 |
| | |||||
* | Bump re2c version for json scanner | Jakub Zelenka | 2015-06-28 | 3 | -3/+3 |
| | |||||
* | Fix bug #68546 (json_decode cannot access property started with \0) | Jakub Zelenka | 2015-06-21 | 5 | -11/+60 |
| | |||||
* | Improve json parser code | Jakub Zelenka | 2015-06-07 | 2 | -38/+147 |
| | |||||
* | Tidy up and regenerate json parser with latest bison version | Jakub Zelenka | 2015-05-10 | 3 | -767/+717 |
| | |||||
* | Optimized json_parser | Xinchen Hui | 2015-05-06 | 3 | -749/+799 |
| | | | | | | 1. use zend_string in key 2. use faster APIs 3. use ZVAL_COPY_VALUE instead of assignment (save u2 copy) | ||||
* | Use Z_ARRVAL_P since we already know it's an array | Xinchen Hui | 2015-05-06 | 1 | -3/+3 |
| | |||||
* | fix datatype mismatches | Anatol Belski | 2015-03-25 | 3 | -3/+3 |
| | |||||
* | s/PHP Version 5/PHP Version 7/g | Lior Kaplan | 2015-03-13 | 7 | -7/+7 |
| | | | | Follow up for d0cb7153 | ||||
* | Improved php_json_escape_string() | Dmitry Stogov | 2015-03-11 | 1 | -98/+103 |
| | |||||
* | ZTS cleanup | Reeze Xia | 2015-03-08 | 2 | -2/+2 |
| | |||||
* | Added test for bug 69187 | Hugo Fonseca | 2015-03-07 | 1 | -0/+33 |
| | |||||
* | Merge branch 'PHP-5.6' | Jakub Zelenka | 2015-02-22 | 2 | -17/+38 |
|\ | | | | | | | The fix for master is a bit different (it's fixed in encoder) | ||||
| * | Merge branch 'PHP-5.5' into PHP-5.6 | Jakub Zelenka | 2015-02-22 | 2 | -17/+27 |
| |\ | | | | | | | | | | | | | Conflicts: ext/json/json.c | ||||
| | * | Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are numbers ↵ | Jakub Zelenka | 2015-02-22 | 2 | -11/+21 |
| | | | | | | | | | | | | plus the letter e) | ||||
| * | | Merge branch 'PHP-5.5' into PHP-5.6 | Julien Pauli | 2015-02-04 | 3 | -19/+2 |
| |\ \ | | |/ | | | | | | | | | | | | | * 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 | 3 | -19/+2 |
| | | | | | | | | | | | | This reverts commit a7b3abe4e6f5e2fdfd8d55b676c9ca6b3f9c8cc8. | ||||
* | | | Set PHP_JSON_VERSION to 1.4.0 | Jakub Zelenka | 2015-02-17 | 1 | -1/+1 |
| | | | |||||
* | | | Delete json outdated package.xml | Jakub Zelenka | 2015-02-16 | 1 | -152/+0 |
| | | | | | | | | | | | | | | | | | | | | | The package.xml has not been update for more then 8 years and there is no reason to keep it. It would require quite a bit of digging in git history to update it which is not worth it. | ||||
* | | | 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 | ||||
* | | | Update JSON Readme | Jakub Zelenka | 2015-02-15 | 1 | -70/+10 |
| | | | |||||
* | | | Remove unused destructor in json parser | Jakub Zelenka | 2015-02-15 | 2 | -5/+4 |
| | | | |||||
* | | | Add bison 3.0.4 genereted files for json parser | Jakub Zelenka | 2015-02-15 | 2 | -0/+1955 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The definitions file (json_parser.tab.h) contains file system dependent name for C preprocessor guard: YY_PHP_JSON_YY_HOME_JAKUB_PROG_PHP_MASTER_EXT_JSON_JSON_PARSER_TAB_H_INCLUDED This is because the srcdir is used for default definitions name. It's a correct default (--definition=$(srcdir)/json_parser.tab.h) because the build would fail otherwise. Unfortunately Bison does not have a special option for defining cpp guard name. The only way would be using skeleton file but that's not possible with the current configuration as it requires using a specific bison version (disallowing range of supported versions). | ||||
* | | | Regenerate json scanner with re2c 0.13.7.5 | Jakub Zelenka | 2015-02-15 | 2 | -2/+2 |
| | | | |||||
* | | | better alignment + support size_t | Anatol Belski | 2015-02-10 | 4 | -465/+464 |
| | | | |||||
* | | | use portable strtol | Anatol Belski | 2015-02-10 | 2 | -2/+2 |
| | | | |||||
* | | | fix json globals | Michael Wallner | 2015-02-09 | 2 | -2/+1 |
| | | | |||||
* | | | regenerated scanner | Anatol Belski | 2015-02-09 | 2 | -459/+460 |
| | | | |||||
* | | | fix datatype mismatches | Anatol Belski | 2015-02-09 | 3 | -7/+7 |
| | | | |||||
* | | | fix inconsistend dll linkage warn | Anatol Belski | 2015-02-09 | 1 | -0/+5 |
| | | | |||||
* | | | size_t vs int | Anatol Belski | 2015-02-09 | 1 | -1/+1 |
| | | | |||||
* | | | use size_t for str length | Anatol Belski | 2015-02-09 | 2 | -2/+2 |
| | | | |||||
* | | | generate missing json files from config.w32 | Anatol Belski | 2015-02-09 | 1 | -0/+11 |
| | | | |||||
* | | | Merge branch 'master' into jsond | Jakub Zelenka | 2015-02-08 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: ext/json/json.c | ||||
| * | | | Use object pointers instead of handles | Dmitry Stogov | 2015-02-04 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix invalid test for bug 54484 | Jakub Zelenka | 2015-02-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | Add re2c sources | Jakub Zelenka | 2015-02-02 | 2 | -0/+1162 |
| | | | | |||||
* | | | | Merge branch 'master' into jsond | Jakub Zelenka | 2015-02-02 | 3 | -2/+19 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.6' | Adam Harvey | 2015-02-02 | 3 | -2/+19 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'PHP-5.5' into PHP-5.6 | Adam Harvey | 2015-02-02 | 3 | -2/+19 |
| | |\ \ | | | |/ | |||||
| | | * | json_decode() should generate a syntax error when given "". | Adam Harvey | 2015-02-02 | 3 | -2/+19 |
| | | | | | | | | | | | | | | | | | | | | 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 | 2 | -2/+2 |
| | | | | |||||
* | | | | Give me credit | Jakub Zelenka | 2015-02-02 | 2 | -0/+2 |
| | | | | |||||
* | | | | Merge branch 'master' into jsond | Jakub Zelenka | 2015-01-25 | 9 | -8/+33 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | Conflicts: ext/json/JSON_parser.c ext/json/json.c | ||||
| * | | | Merge branch 'PHP-5.6' | Stanislav Malyshev | 2015-01-19 | 3 | -8/+90 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | * 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 | 3 | -8/+90 |
| | | | | |||||
| | * | | bump year | Xinchen Hui | 2015-01-15 | 2 | -2/+2 |
| | | | | |||||
| * | | | bump year | Xinchen Hui | 2015-01-15 | 2 | -2/+2 |
| | | | |