Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Sync with e0fe6674 | Anatol Belski | 2018-08-13 | 1 | -1/+1 |
| | |||||
* | Fix bug #76030 RE2C_FLAGS rarely honoured | Cristian Rodríguez | 2018-08-12 | 1 | -1/+1 |
| | | | | | | | | | Since PHP 5.3 the default lexer generator is RE2C. On Unix-alike build systems there is also optional configure option --enable-re2c-cgoto which enables optimized conditional jumps using non-standard computed goto extension. It is available since RE2C 0.10.3 so it's well covered by RE2C versions PHP uses. This patch syncs usage of -g option accross the PHP Unix-alike build system. | ||||
* | Make more tests run on 64bit plataforms | Gabriel Caruso | 2018-07-30 | 1 | -2/+1 |
| | |||||
* | Regenerate scanners using re2c version >= 1.0.0 (newer version, at least, ↵ | Dmitry Stogov | 2018-07-25 | 2 | -45/+41 |
| | | | | produce less code) | ||||
* | Remove unused Git attributes ident | Peter Kokot | 2018-07-25 | 2 | -4/+1 |
| | | | | | | | | | | | | | | | The $Id$ keywords were used in Subversion where they can be substituted with filename, last revision number change, last changed date, and last user who changed it. In Git this functionality is different and can be done with Git attribute ident. These need to be defined manually for each file in the .gitattributes file and are afterwards replaced with 40-character hexadecimal blob object name which is based only on the particular file contents. This patch simplifies handling of $Id$ keywords by removing them since they are not used anymore. | ||||
* | Revert "Rename _zval_dtor_func to _ref_dtor_func" | Xinchen Hui | 2018-07-06 | 2 | -768/+718 |
| | | | | This reverts commit a362ae6b12419369c5cbdbb4e924915f9b196ef6. | ||||
* | Rename _zval_dtor_func to _ref_dtor_func | Xinchen Hui | 2018-07-06 | 2 | -718/+768 |
| | |||||
* | Use zval_ptr_dtor_nogc() in JSON parser (it can't produce circular data ↵ | Dmitry Stogov | 2018-07-05 | 2 | -26/+26 |
| | | | | structures) | ||||
* | Bump PHP_JSON_VERSION to 1.7.0 | Jakub Zelenka | 2018-06-14 | 1 | -1/+1 |
| | |||||
* | php_json_escape_string() optimization | Dmitry Stogov | 2018-06-13 | 1 | -35/+60 |
| | |||||
* | Removed useless zval_ptr_dtor() | Dmitry Stogov | 2018-05-29 | 1 | -1/+1 |
| | |||||
* | Use zend_string_release_ex() instread of zend_string_release() in places, ↵ | Dmitry Stogov | 2018-05-28 | 3 | -12/+12 |
| | | | | where we sure about string persistence. | ||||
* | Bit test optimization | Dmitry Stogov | 2018-05-08 | 1 | -1/+1 |
| | |||||
* | Bit check micro-optimization | Dmitry Stogov | 2018-04-28 | 1 | -1/+1 |
| | |||||
* | Use int instead of long in protos | Gabriel Caruso | 2018-02-23 | 1 | -1/+1 |
| | |||||
* | Use EXPECT instead of EXPECTF when possible | Gabriel Caruso | 2018-02-20 | 17 | -17/+17 |
| | | | | EXPECTF logic in run-tests.php is considerable, so let's avoid it. | ||||
* | Add missing SKIPIF sections | Gabriel Caruso | 2018-02-03 | 4 | -0/+9 |
| | |||||
* | Add tests for `json_decode` with depth below 0 | Nat Zimmermann | 2018-01-24 | 1 | -0/+8 |
| | |||||
* | Trailing whitespaces | Gabriel Caruso | 2018-01-03 | 1 | -33/+33 |
| | | | | Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com> | ||||
* | year++ | Xinchen Hui | 2018-01-02 | 10 | -10/+10 |
| | |||||
* | Merge branch 'PHP-7.2' | Jakub Zelenka | 2017-12-30 | 6 | -6/+4 |
|\ | |||||
| * | Merge branch 'PHP-7.1' into PHP-7.2 | Jakub Zelenka | 2017-12-30 | 6 | -6/+4 |
| |\ | |||||
| | * | Use seialize_precision instead of precision in all json tests | Jakub Zelenka | 2017-12-30 | 6 | -6/+6 |
| | | | |||||
* | | | RC manipulation cleanup 2 | Xinchen Hui | 2017-11-02 | 3 | -14/+8 |
| | | | |||||
* | | | Merge JSON_THROW_ON_ERROR | Andrea Faulds | 2017-10-22 | 5 | -34/+218 |
| | | | |||||
* | | | Merge branch 'PHP-7.2' | Jakub Zelenka | 2017-10-15 | 2 | -2/+21 |
|\ \ \ | |/ / | |||||
| * | | Fix bug #68567 (JSON_PARTIAL_OUTPUT_ON_ERROR can result in JSON with null key) | Jakub Zelenka | 2017-10-15 | 2 | -2/+21 |
| | | | |||||
* | | | Merge branch 'PHP-7.2' | Xinchen Hui | 2017-10-13 | 6 | -1/+11 |
|\ \ \ | |/ / | | | | | | | | | | | | | * PHP-7.2: Prevent from being affected by local php.ini Added skipf | ||||
| * | | Prevent from being affected by local php.ini | Xinchen Hui | 2017-10-13 | 6 | -1/+11 |
| | | | |||||
* | | | Refactored recursion pretection | Dmitry Stogov | 2017-10-06 | 1 | -16/+16 |
| | | | |||||
* | | | Sync json parser defs | Anatol Belski | 2017-09-20 | 1 | -2/+4 |
| | | | |||||
* | | | Refactored array creation API. array_init() and array_init_size() are ↵ | Dmitry Stogov | 2017-09-20 | 1 | -2/+4 |
|/ / | | | | | | | converted into macros calling zend_new_array(). They are not functions anymore and don't return any values. | ||||
* | | Reset utf8_invalid in json scanner | Jakub Zelenka | 2017-08-10 | 2 | -0/+2 |
| | | |||||
* | | Fix possible overflow in json scanner utf8_invalid_count | Jakub Zelenka | 2017-08-10 | 2 | -4/+18 |
| | | |||||
* | | Merge branch 'PHP-7.1' into PHP-7.2 | Darek Slusarczyk | 2017-08-08 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | # Conflicts: # ext/json/config.w32 | ||||
| * | Merge branch 'PHP-7.0' into PHP-7.1 | Darek Slusarczyk | 2017-08-08 | 1 | -1/+1 |
| |\ | |||||
| | * | JSON: fix config.w32 / Install headers on windows | Darek Slusarczyk | 2017-08-08 | 1 | -1/+1 |
| | | | |||||
* | | | Fix segfault in json ignoring of invalid UTF8 | Jakub Zelenka | 2017-08-06 | 3 | -1/+22 |
| | | | |||||
* | | | Bump PHP_JSON_VERSION to 1.6.0 | Jakub Zelenka | 2017-07-16 | 1 | -1/+1 |
| | | | |||||
* | | | [ci skip] Remove CSV leftovers from json code - $Id$ | Jakub Zelenka | 2017-07-16 | 3 | -6/+0 |
| | | | |||||
* | | | Introduce internal php_json_encode_ex to allow extensions setting depth | Jakub Zelenka | 2017-07-16 | 2 | -5/+9 |
| | | | |||||
* | | | Add JSON_INVALID_UTF8_SUBSTITUTE and JSON_INVALID_UTF8_IGNORE | Jakub Zelenka | 2017-07-16 | 9 | -198/+713 |
| | | | | | | | | | | | | | | | 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 |
| | | | |||||
* | | | Optimization for fast path. | Dmitry Stogov | 2017-06-19 | 1 | -80/+83 |
| | | | |||||
* | | | Merge branch 'PHP-7.1' | Jakub Zelenka | 2017-06-18 | 3 | -695/+626 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Jakub Zelenka | 2017-06-18 | 3 | -695/+626 |
| |\ \ | | |/ | |||||
| | * | Regenerate and bump re2c version to 0.16 | Jakub Zelenka | 2017-06-18 | 3 | -642/+574 |
| | | | | | | | | | | | | It also matches the re2c version for Zend language scanner | ||||
| | * | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-04 | 10 | -10/+10 |
| | | | |||||
| * | | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-04 | 10 | -10/+10 |
| | | | |||||
| * | | Install ext/json headers | Johannes Schlüter | 2016-12-07 | 1 | -1/+1 |
| | | |