Merge branch 'PHP-8.0' into PHP-8.1

Author: bukka

NEWS

@@ -21,6 +21,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)
 
 - Hash:
   . Fixed bug #81714 (segfault when serializing finalized HashContext). (cmb)

sapi/fpm/fpm/events/kqueue.c

@@ -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;
 }