[pull] master from php:master - #1305
Merged
Merged
Conversation
This updates the minimum required Autoconf version to 2.71. - Autoconf versions 2.70 started supporting C11 standards. - Autoconf 2.71 was released soon after 2.70 providing some bugfixes. Changes: - Removed obsolete AC_PROG_CC_C99 macro. In Autoconf 2.70 and later this is done by the AC_PROG_CC macro. - m4_normalize is not needed for AC_CHECK_HEADERS and AC_CHECK_FUNCTIONS macros anymore, as the argument is normalized internally by Autoconf in these newer versions. - Adjusted C11 check in configure.ac and added check also in phpize mode. Extensions using PHP headers should be also built with some C11-compliant compiler. - Removed ac_cv_header_sys_types_h_makedev hack for AC_HEADER_MAJOR macro when using Autoconf versions prior to 2.70. - Replaced AC_CONFIG_MACRO_DIR with preferred AC_CONFIG_MACRO_DIRS. This also enables using --runstatedir configure option in the future.
C11 / C++11 are the baseline requirements, thus we only need to check for Windows.
The forwarding call is built 2x, and if the first time coerces an argument, you have a failed assertion the second time. So the type check (which does the coercion) has to happen on a value copy. Closes GH-23895.
* PHP-8.6: Fix OSS-Fuzz #565486253: coerced arg with '...' on non-variadic function
* tree-wide: Replace `ZEND_STATIC_ASSERT()` by `static_assert()` * zend_portability: Remove `ZEND_STATIC_ASSERT()`
…ons() A registerPHPFunctions() call that threw on a non callable name had already allocated the callback namespace, leaving it in PHP_DOM_REG_FUNC_MODE_NONE. The next php:function() call dispatched into it and tripped the MODE_SET assertion. Close GH-23900
* PHP-8.4: Fix GH-23897: php:function() assertion after failed registerPHPFunctions()
* PHP-8.5: Fix GH-23897: php:function() assertion after failed registerPHPFunctions()
* PHP-8.6: Fix GH-23897: php:function() assertion after failed registerPHPFunctions()
zend_get_known_property_info treated a ZEND_ACC_CHANGED public property as the known offset even when the executing scope owned a private property of the same name, so tracing JIT wrote through a child's public slot. Returning NULL uses the runtime-cache path, which already goes through zend_get_property_offset. FETCH_OBJ_W, ASSIGN_OBJ, INC, and ASSIGN_OBJ_OP share the helper; $this access, child methods, and unshadowed or protected-to-public properties do not hit this arm. Fixes GH-23679 Closes GH-23683
* PHP-8.5: ext/opcache: Fix GH-23679 tracing JIT shadowed private writes
* PHP-8.6: ext/opcache: Fix GH-23679 tracing JIT shadowed private writes
These files should be congruent across branches.
* PHP-8.2: [skip ci] Sync .github files
* PHP-8.3: [skip ci] Sync .github files
* PHP-8.4: [skip ci] Sync .github files
* PHP-8.5: [skip ci] Sync .github files
* PHP-8.6: [skip ci] Sync .github files
ASAN stack usage is unreliable so we might overflow before the limit is reached.
* PHP-8.2: [skip ci] Skip recursion tests on ASAN
* PHP-8.3: [skip ci] Skip recursion tests on ASAN
* PHP-8.4: [skip ci] Skip recursion tests on ASAN
* PHP-8.5: [skip ci] Skip recursion tests on ASAN
* PHP-8.6: [skip ci] Skip recursion tests on ASAN
This function is only used in debug builds.
* PHP-8.4: #if out zend_class_constants_are_updated() in release builds
* PHP-8.5: #if out zend_class_constants_are_updated() in release builds
* PHP-8.6: #if out zend_class_constants_are_updated() in release builds
…23624) * ext/pcntl: run signal handlers when dispatch happens with an exception pending ZEND_DO_FCALL runs its interrupt check right after an internal function returns, before the pending exception is handled, and zend_call_function() does the same for the calls it makes, so pcntl_interrupt_function() can reach the dispatcher with EG(exception) set. call_user_function() returns without calling anything in that state, the "if (EG(exception)) break" added by 296fad1 fires on the first entry, and the drain loop then recycles the whole queue without a single handler having run. The signal is destroyed rather than delayed: a later pcntl_signal_dispatch() finds nothing left. Set the exception aside while the handlers run and chain it back afterwards. The frame is left as found, EG(opline_before_exception) included: depending on the caller, the exception may not be registered on it yet, or may already be on its way to a catch block, and the caller finishes the job once we return. zend_test_raise_and_throw() and the user frame test are from Arnaud Le Blanc. Any long blocking internal call that throws on timeout reaches this. pecl/amqp throws "Consumer timeout exceed" out of AMQPQueue::consume(), which makes a Symfony messenger worker miss every SIGTERM whatever the timeout is. PDO/SQLite throws "database is locked" once busy_timeout expires, which kills a keepalive SIGALRM for the rest of the process's life. * ext/pcntl: keep the signals a throwing handler left in the queue When a handler threw, the signals queued behind it were recycled without ever being delivered. Put them back on the queue instead, and re-arm the interrupt so that the engine dispatches them once the exception has been handled, rather than leaving them to wait for another signal to come in. Not calling further handlers while the exception propagates is unchanged.
* PHP-8.4: ext/pcntl: do not drop queued signals when an exception is pending (#23624)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )