a5f4d3cd45
03 Jun 2021, PHP 8.0.7 - Core: . Fixed bug #80960 (opendir() warning wrong info when failed on Windows). (cmb) . Fixed bug #67792 (HTTP Authorization schemes are treated as case-sensitive). (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) - GD: . Fixed bug #81032 (GD install is affected by external libgd installation). (Flavio Heleno, cmb) - Intl: . Fixed bug #81019 (Unable to clone NumberFormatter after failed parse()). (Nikita) - MBString: . Fixed bug #81011 (mb_convert_encoding removes references from arrays). (cmb) - ODBC: . Fixed bug #80460 (ODBC doesn't account for SQL_NO_TOTAL indicator). (cmb) - Opcache: . Fixed bug #81007 (JIT "not supported" on 32-bit x86 -- build problem?). (Nikita) . Fixed bug #81015 (Opcache optimization assumes wrong part of ternary operator in if-condition). (Nikita) . Fixed bug #81046 (Literal compaction merges non-equal related literals). (Nikita) - PDO_MySQL: . Fixed bug #81037 (PDO discards error message text from prepared statement). (Kamil Tekiela) - PDO_ODBC: . Fixed bug #44643 (bound parameters ignore explicit type definitions). (cmb) - pgsql: . Fixed php_pgsql_fd_cast() wrt. php_stream_can_cast(). (cmb) - SPL: . Fixed bug #80933 (SplFileObject::DROP_NEW_LINE is broken for NUL and CR). (cmb, Nikita) - XMLReader: . Fixed bug #73246 (XMLReader: encoding length not checked). (cmb) - Zip: . Fixed bug #80863 (ZipArchive::extractTo() ignores references). (cmb)
33 lines
975 B
C
33 lines
975 B
C
$NetBSD: patch-sapi_fpm_fpm_events_port.c,v 1.2 2021/06/04 13:56:31 taca Exp $
|
|
|
|
Similar to upstream bug #65800. We should resubmit this patch and
|
|
get that bugfix intergrated, by changing port_associate() call to
|
|
use the wrapper fpm_event_port_add().
|
|
|
|
--- sapi/fpm/fpm/events/port.c.orig 2021-06-01 18:43:05.000000000 +0000
|
|
+++ sapi/fpm/fpm/events/port.c
|
|
@@ -145,14 +145,23 @@ static int fpm_event_port_wait(struct fp
|
|
}
|
|
|
|
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;
|
|
+
|
|
+ if (port_associate(pfd, PORT_SOURCE_FD,
|
|
+ ev->fd, POLLIN, (void *)ev) < 0) {
|
|
+ zlog(ZLOG_ERROR, "port: unable to add the event");
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
/* 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()) {
|