Skip to content

Commit 3642042

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: IBM i PASE doesn't support ITIMER_PROF
2 parents c1e977f + b6d043a commit 3642042

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Zend/zend_execute_API.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,7 @@ static void zend_set_timeout_ex(zend_long seconds, bool reset_signals) /* {{{ */
13821382
t_r.it_value.tv_sec = seconds;
13831383
t_r.it_value.tv_usec = t_r.it_interval.tv_sec = t_r.it_interval.tv_usec = 0;
13841384

1385-
# ifdef __CYGWIN__
1385+
# if defined(__CYGWIN__) || defined(__PASE__)
13861386
setitimer(ITIMER_REAL, &t_r, NULL);
13871387
}
13881388
signo = SIGALRM;
@@ -1444,7 +1444,7 @@ void zend_unset_timeout(void) /* {{{ */
14441444

14451445
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;
14461446

1447-
# ifdef __CYGWIN__
1447+
# if defined(__CYGWIN__) || defined(__PASE__)
14481448
setitimer(ITIMER_REAL, &no_timeout, NULL);
14491449
# else
14501450
setitimer(ITIMER_PROF, &no_timeout, NULL);

Zend/zend_signal.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ ZEND_API zend_signal_globals_t zend_signal_globals;
6262
static void zend_signal_handler(int signo, siginfo_t *siginfo, void *context);
6363
static int zend_signal_register(int signo, void (*handler)(int, siginfo_t*, void*));
6464

65-
#ifdef __CYGWIN__
65+
#if defined(__CYGWIN__) || defined(__PASE__)
66+
/* Matches zend_excute_API.c; these platforms don't support ITIMER_PROF. */
6667
#define TIMEOUT_SIG SIGALRM
6768
#else
6869
#define TIMEOUT_SIG SIGPROF

0 commit comments

Comments
 (0)