Merge branch 'PHP-8.0' into PHP-8.1

This commit is contained in:
Jakub Zelenka 2022-11-22 18:02:02 +00:00
commit 31b20f1737
No known key found for this signature in database
GPG Key ID: 1C0779DC5C0A9DE4
2 changed files with 9 additions and 1 deletions

2
NEWS
View File

@ -45,6 +45,8 @@ PHP NEWS
- FPM:
. Fixed bug GH-9754 (SaltStack (using Python subprocess) hangs when running
php-fpm 8.1.11). (Jakub Zelenka)
. Fixed bug GH-9959 (Solaris port event mechanism is still broken after bug
#66694). (Petr Sumbera)
- mysqli:
. Fixed bug GH-9841 (mysqli_query throws warning despite using

View File

@ -144,14 +144,20 @@ static int fpm_event_port_wait(struct fpm_event_queue_s *queue, unsigned long in
}
for (i = 0; i < nget; i++) {
struct fpm_event_s *ev;
/* do we have a ptr to the event ? */
if (!events[i].portev_user) {
continue;
}
ev = (struct fpm_event_s *)events[i].portev_user;
/* re-associate for next event */
fpm_event_port_add(ev);
/* fire the event */
fpm_event_fire((struct fpm_event_s *)events[i].portev_user);
fpm_event_fire(ev);
/* sanity check */
if (fpm_globals.parent_pid != getpid()) {