Skip to content

Commit

Permalink
Fix FPM kqueue handler fix remove callback typo
Browse files Browse the repository at this point in the history
It avoids confusion on failed event.
  • Loading branch information
devnexen authored and bukka committed Apr 23, 2022
1 parent 6186ecd commit ff90d42
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ PHP NEWS
. Fixed bug #76003 (FPM /status reports wrong number of active processe).
(Jakub Zelenka)
. Fixed bug #77023 (FPM cannot shutdown processes). (Jakub Zelenka)
. Fixed comment in kqueue remove callback log message. (David Carlier)

- MySQLi:
. Fixed bug GH-8267 (MySQLi uses unsupported format specifier on Windows).
Expand Down
4 changes: 2 additions & 2 deletions sapi/fpm/fpm/events/kqueue.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,11 @@ static int fpm_event_kqueue_remove(struct fpm_event_s *ev) /* {{{ */
EV_SET(&k, ev->fd, EVFILT_READ, flags, 0, 0, (void *)ev);

if (kevent(kfd, &k, 1, NULL, 0, NULL) < 0) {
zlog(ZLOG_ERROR, "kevent: unable to add event");
zlog(ZLOG_ERROR, "kevent: unable to delete event");
return -1;
}

/* mark the vent as not registered */
/* mark the event as not registered */
ev->index = -1;
return 0;
}
Expand Down

0 comments on commit ff90d42

Please sign in to comment.