Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  php-fpm: fix Solaris port events.mechanism

Author: krakjoe

NEWS

@@ -9,6 +9,9 @@ PHP                                                                        NEWS
     (cmb)
   . Fixed bug #80972 (Memory exhaustion on invalid string offset). (girgias)
 
+- FPM:
+  . Fixed bug #65800 (Events port mechanism). (psumbera)
+
 - FTP:
   . Fixed bug #80901 (Info leak in ftp extension). (cmb)
   . Fixed bug #79100 (Wrong FTP error messages). (cmb)

sapi/fpm/fpm/events/port.c

@@ -112,7 +112,8 @@ static int fpm_event_port_clean() /* {{{ */
  */
 static int fpm_event_port_wait(struct fpm_event_queue_s *queue, unsigned long int timeout) /* {{{ */
 {
-	int ret, i, nget;
+	int ret
+	unsigned int i, nget;
 	timespec_t t;
 
 	/* convert timeout into timespec_t */
@@ -121,13 +122,25 @@ static int fpm_event_port_wait(struct fpm_event_queue_s *queue, unsigned long in
 
 	/* wait for inconming event or timeout. We want at least one event or timeout */
 	nget = 1;
+	events[0].portev_user = (void *)-1; /* so we can double check that an event was returned */
+
 	ret = port_getn(pfd, events, nevents, &nget, &t);
 	if (ret < 0) {
 
 		/* trigger error unless signal interrupt or timeout */
 		if (errno != EINTR && errno != ETIME) {
 			zlog(ZLOG_WARNING, "poll() returns %d", errno);
 			return -1;
+		} else if (nget > 0 && events[0].portev_user == (void *)-1) {
+			/* This confusing API can return an event at the same time
+			 * that it reports EINTR or ETIME.  If that occurs, just
+			 * report the event.  With EINTR, nget can be > 0 without
+			 * any event, so check that portev_user was filled in.
+			 *
+			 * See discussion thread
+			 *   http://marc.info/?l=opensolaris-networking-discuss&m=125071205204540
+			 */
+			nget = 0;
 		}
 	}