Skip to content

Commit 72da2b0

Browse files
psumberabukka
authored andcommitted
php-fpm: fix Solaris port events.mechanism
Closes phpGH-9959.
1 parent 4bdfce6 commit 72da2b0

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ PHP NEWS
2323
- FPM:
2424
. Fixed bug GH-9754 (SaltStack (using Python subprocess) hangs when running
2525
php-fpm 8.1.11). (Jakub Zelenka)
26+
. Fixed bug GH-9959 (Solaris port event mechanism is still broken after bug
27+
#66694). (Petr Sumbera)
2628

2729
- mysqli:
2830
. Fixed bug GH-9841 (mysqli_query throws warning despite using

sapi/fpm/fpm/events/port.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,20 @@ static int fpm_event_port_wait(struct fpm_event_queue_s *queue, unsigned long in
144144
}
145145

146146
for (i = 0; i < nget; i++) {
147+
struct fpm_event_s *ev;
147148

148149
/* do we have a ptr to the event ? */
149150
if (!events[i].portev_user) {
150151
continue;
151152
}
152153

154+
ev = (struct fpm_event_s *)events[i].portev_user;
155+
156+
/* re-associate for next event */
157+
fpm_event_port_add(ev);
158+
153159
/* fire the event */
154-
fpm_event_fire((struct fpm_event_s *)events[i].portev_user);
160+
fpm_event_fire(ev);
155161

156162
/* sanity check */
157163
if (fpm_globals.parent_pid != getpid()) {

0 commit comments

Comments
 (0)