diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-15 10:15:47 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-15 10:15:47 +0100 |
| commit | b6d043aae25ea872f9768e19e0999545ab0298f1 (patch) | |
| tree | beb0b3dd845f5ac71bf6a34d84f08f0fd2e9edd0 | |
| parent | 1e6c7e776c1f8958524d5b7af047e55108d870d2 (diff) | |
| parent | 54248b18fea80dcb8b7e62550c8566df10e8e935 (diff) | |
| download | php-git-b6d043aae25ea872f9768e19e0999545ab0298f1.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
IBM i PASE doesn't support ITIMER_PROF
| -rw-r--r-- | Zend/zend_execute_API.c | 4 | ||||
| -rw-r--r-- | Zend/zend_signal.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 4248212238..b55b2e7385 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1382,7 +1382,7 @@ static void zend_set_timeout_ex(zend_long seconds, bool reset_signals) /* {{{ */ t_r.it_value.tv_sec = seconds; t_r.it_value.tv_usec = t_r.it_interval.tv_sec = t_r.it_interval.tv_usec = 0; -# ifdef __CYGWIN__ +# if defined(__CYGWIN__) || defined(__PASE__) setitimer(ITIMER_REAL, &t_r, NULL); } signo = SIGALRM; @@ -1444,7 +1444,7 @@ void zend_unset_timeout(void) /* {{{ */ no_timeout.it_value.tv_sec = no_timeout.it_value.tv_usec = no_timeout.it_interval.tv_sec = no_timeout.it_interval.tv_usec = 0; -# ifdef __CYGWIN__ +# if defined(__CYGWIN__) || defined(__PASE__) setitimer(ITIMER_REAL, &no_timeout, NULL); # else setitimer(ITIMER_PROF, &no_timeout, NULL); diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c index 80feecd98f..af3ef8cbc6 100644 --- a/Zend/zend_signal.c +++ b/Zend/zend_signal.c @@ -62,7 +62,8 @@ ZEND_API zend_signal_globals_t zend_signal_globals; static void zend_signal_handler(int signo, siginfo_t *siginfo, void *context); static int zend_signal_register(int signo, void (*handler)(int, siginfo_t*, void*)); -#ifdef __CYGWIN__ +#if defined(__CYGWIN__) || defined(__PASE__) +/* Matches zend_excute_API.c; these platforms don't support ITIMER_PROF. */ #define TIMEOUT_SIG SIGALRM #else #define TIMEOUT_SIG SIGPROF |