Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed bug #74164 (PHP hangs when an invalid value is dynamically passed to ↵ | Xinchen Hui | 2017-02-25 | 1 | -0/+18 |
| | | | | typehinted by-ref arg) | ||||
* | Workaround to fix bug #74093 (Maximum execution time of n+2 seconds exceed ↵ | Xinchen Hui | 2017-02-15 | 1 | -1/+1 |
| | | | | | | | | not written in error_log) Use a different exit code for hard_timeout, 124 is used by linux timeout:http://man7.org/linux/man-pages/man1/timeout.1.html "If the command times out, and --preserve-status is not set, then exit with status 124" | ||||
* | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-26 | 1 | -4/+4 |
|\ | | | | | | | | | * PHP-7.0: Fixed #73973 - debug_zval_dump() assertion error for resource consts with --enable-debug | ||||
| * | Fixed #73973 - debug_zval_dump() assertion error for resource consts with ↵ | andrewnester | 2017-01-26 | 1 | -4/+4 |
| | | | | | | | | --enable-debug | ||||
| * | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-04 | 1 | -1/+1 |
| | | |||||
* | | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-04 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2016-11-20 | 1 | -1/+1 |
|\ \ | |||||
| * | | Revert "Remove a few unused write warning (backport from master, oops)s" | Nikita Popov | 2016-11-20 | 1 | -0/+1 |
| | | | | | | | | | | | | This reverts commit c65d24eaa3671e61db7c2a3f28daeaf7c74ac758. | ||||
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Bob Weinand | 2016-11-20 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Remove a few unused write warning (backport from master, oops)s | Bob Weinand | 2016-11-20 | 1 | -1/+0 |
| |/ | |||||
* | | Fixed bug #73303 | Nikita Popov | 2016-11-18 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Dmitry Stogov | 2016-10-18 | 1 | -1/+4 |
|\ \ | |/ | | | | | | | | | | | * PHP-7.0: Fixed bug #73337 (try/catch not working with two exceptions inside a same operation) Revert "Fix bug #47890 #73215 uniqid() should use better random source" Update NEWS | ||||
| * | Merge branch 'PHP-5.6' into PHP-7.0 | Dmitry Stogov | 2016-10-18 | 1 | -0/+3 |
| |\ | | | | | | | | | | | | | * PHP-5.6: Fixed bug #73337 (try/catch not working with two exceptions inside a same operation) | ||||
| | * | Fixed bug #73337 (try/catch not working with two exceptions inside a same ↵ | Dmitry Stogov | 2016-10-18 | 1 | -0/+3 |
| | | | | | | | | | | | | operation) | ||||
| | * | bump year which is missed in rev 49493a2 | Xinchen Hui | 2016-01-02 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'PHP-5.5' into PHP-5.6 | Dmitry Stogov | 2015-04-08 | 1 | -0/+4 |
| | |\ | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer) Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer) | ||||
| | | * | Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer) | Dmitry Stogov | 2015-04-08 | 1 | -0/+4 |
| | | | | |||||
| | | * | Bump year | Xinchen Hui | 2015-01-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | bump year | Xinchen Hui | 2015-01-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2016-09-24 | 1 | -11/+12 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed bug #73163 | Nikita Popov | 2016-09-24 | 1 | -29/+19 |
| | | | | |||||
* | | | | call_user_func(_array): Don't abort on reference warning | Nikita Popov | 2016-08-23 | 1 | -22/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | Change zend_call_function() to not abort the call if a non-reference is passed to a reference argument. The usual warning will still be thrown, but the call will proceed as usual. | ||||
* | | | | Fix invalid free on undef const in update_const() | Nikita Popov | 2016-07-30 | 1 | -16/+14 |
| | | | | | | | | | | | | | | | | | | | | Also clean up the control flow a bit -- move all unqualified constant handling in one branch. | ||||
* | | | | Safer signal handler (no malloc() call) | Keyur | 2016-07-12 | 1 | -3/+6 |
| | | | | |||||
* | | | | Fixed unused var | Xinchen Hui | 2016-06-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | improve ZEND_MODULE_GLOBALS_BULK macro, fix data type | Anatol Belski | 2016-06-23 | 1 | -8/+2 |
| | | | | |||||
* | | | | typo | Dmitry Stogov | 2016-06-23 | 1 | -1/+1 |
| | | | | |||||
* | | | | Turn safe timeout handling into general interrupt handling ability. | Dmitry Stogov | 2016-06-23 | 1 | -4/+15 |
| | | | | |||||
* | | | | Added ZEND_ATTRIBUTE_FORMAT to some middind functions. | Dmitry Stogov | 2016-06-21 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | "%p" replaced by ZEND_LONG_FMT to avoid compilation warnings. Fixed most incorrect use cases of format specifiers. | ||||
* | | | | hard_timeout ignored on TS | Anatol Belski | 2016-06-06 | 1 | -0/+2 |
| | | | | |||||
* | | | | fix hard_timeout support in shutdown functions | Anatol Belski | 2016-06-06 | 1 | -0/+14 |
| | | | | |||||
* | | | | Forbid dynamic calls to scope introspection functions | Nikita Popov | 2016-05-24 | 1 | -1/+15 |
| | | | | | | | | | | | | | | | | | | | | Per RFC: https://wiki.php.net/rfc/forbid_dynamic_scope_introspection | ||||
* | | | | Eliminated checks for (func->op_array.fn_flags & ZEND_ACC_GENERATOR) in fast ↵ | Dmitry Stogov | 2016-05-13 | 1 | -6/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | path of DO_FCALL* handlers. This slightly improves calls to regular function and method calls in cost of a bit slower generator initialization. Separate call frame for generators, allocated on heap, now created by ZEND_GENERATOR_CREATE instruction. | ||||
* | | | | Intern some known (and offten used) strings. | Dmitry Stogov | 2016-05-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | Revert "Refactor zval cleanup into single function" | Dmitry Stogov | 2016-05-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | This reverts commit bac6fdb0c52c924e726c5a78de8858bf27b6586b. | ||||
* | | | | Refactor zval cleanup into single function | Bob Weinand | 2016-05-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Also use zval_ptr_dtor_nogc() everywhere in Zend in favor of zval_dtor() | ||||
* | | | | Fix bug #71897 | Andrea Faulds | 2016-05-04 | 1 | -1/+1 |
| | | | | |||||
* | | | | Drop dead code from update_constant | Nikita Popov | 2016-04-29 | 1 | -14/+1 |
| | | | | |||||
* | | | | Fix usages of zend_update_constant_ex | Nikita Popov | 2016-04-29 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | | If an in-place update in an external zval is performed, it needs to incref'd beforehand, not afterwards. | ||||
* | | | | Don't initialize EX(call)->symbol_table on each function call. | Dmitry Stogov | 2016-04-28 | 1 | -5/+4 |
| | | | | | | | | | | | | | | | | Keep it uninitialized, and check ZEND_CALL_HAS_SYMBOL_TABLE flag when necessary. | ||||
* | | | | - get rid of EG(scope). zend_get_executed_scope() should be used instead. | Dmitry Stogov | 2016-04-28 | 1 | -35/+38 |
| | | | | | | | | | | | | | | | | - ichanged zval_update_constant_ex(). Use IS_TYPE_IMMUTABLE flag on shared constants and AST, instead of "inline_change" parameter. | ||||
* | | | | Removed "zend_fcall_info.function_table". It was assigned in many places, ↵ | Dmitry Stogov | 2016-04-27 | 1 | -10/+2 |
| | | | | | | | | | | | | | | | | but is never used. | ||||
* | | | | Mark zend_timeout as noreturn | Nikita Popov | 2016-04-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Otherwise we get a compiler warning... | ||||
* | | | | Safe execution timeout handling. | Dmitry Stogov | 2016-04-20 | 1 | -13/+74 |
| | | | | |||||
* | | | | Merge branch 'PHP-7.0' | Joe Watkins | 2016-04-11 | 1 | -0/+3 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | * PHP-7.0: handle dummy frame | ||||
| * | | | handle dummy frame | Joe Watkins | 2016-04-11 | 1 | -0/+3 |
| | | | | |||||
* | | | | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-04-01 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed bug #71930 (_zval_dtor_func: Assertion `(arr)->gc.refcount <= 1' failed) | Xinchen Hui | 2016-04-01 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge zend_execute_data->called_scope into zend_execute_data->This. | Dmitry Stogov | 2016-04-01 | 1 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | "called_scope" made sense only for static method calls, for dynamic calls it was always equal to the class of $this. Now EG(This) may store IS_OBJECT + $this or IS_UNUSED + "called_scope" (of course, "called_scope" may be NULL). Some code might need to be adopted to support this change. Checks (Z_OBJ(EX(This))) might need to be converted into (Z_TYPE(EX(This)) == IS_OBJECT). | ||||
* | | | | Use CALL_INFO flag to check if we need to destroy symbol_table. | Dmitry Stogov | 2016-03-31 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | This saves one memory load on most RETURN opcodes. |