lang/php74: update to 7.4.20

03 Jun 2021, PHP 7.4.20

- Core:
  . Fixed bug #80929 (Method name corruption related to repeated calls to
    call_user_func_array). (twosee)
  . 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)

- 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)

- 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)

- Opcache:
  . Fixed bug #80900 (switch statement behavior inside function). (twosee)
  . Fixed bug #81015 (Opcache optimization assumes wrong part of ternary
    operator in if-condition). (Nikita)

- XMLReader:
  . Fixed bug #73246 (XMLReader: encoding length not checked). (cmb)

- Zip:
  . Fixed bug #80863 (ZipArchive::extractTo() ignores references). (cmb)

2 files changed, 9 insertions, 25 deletions

diff --git a/lang/php74/distinfo b/lang/php74/distinfo
index f88549a17b5..70fd574a5ed 100644
--- a/lang/php74/distinfo
+++ b/lang/php74/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.23 2021/05/06 13:52:29 taca Exp $
+$NetBSD: distinfo,v 1.24 2021/06/03 15:28:49 taca Exp $
 
-SHA1 (php-7.4.19.tar.xz) = 1007577f0d50a514b16e87e7662306ee4a14225c
-RMD160 (php-7.4.19.tar.xz) = 603c5c84e55c190fe2a536be1b3a83098a3eb3bf
-SHA512 (php-7.4.19.tar.xz) = 2ac51b9920069ebe8ac68a94f8e9aac2b3d44d69668f340aba95f8303632fe1bfc4c3f2ce398cc7e2c2ea48583d8e04dedfc66f7147c1f4470a55417554d0071
-Size (php-7.4.19.tar.xz) = 10341424 bytes
+SHA1 (php-7.4.20.tar.xz) = 31de425ccea91f93758389b867348c50c683f408
+RMD160 (php-7.4.20.tar.xz) = c58038b61d4b2b071c5c86cc660856740ad22707
+SHA512 (php-7.4.20.tar.xz) = 40261c5a85341fa7c495db86ef3526d1ae2751c6abb05251819c2b7080050715eb44a19c3f8655d101f4308209487ce16dcf94067b71b084c912470796b217f7
+Size (php-7.4.20.tar.xz) = 10345912 bytes
 SHA1 (patch-build_libtool.m4) = 3656eb516fb14defd4b0964fe21e117c630be856
 SHA1 (patch-configure) = 5e9c9c06f6d819d5ba2832d648f41363f40f3108
 SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
@@ -20,5 +20,5 @@ SHA1 (patch-php.ini-development) = e6815f2774ba071baa510fd5490fb5fa377d2462
 SHA1 (patch-php.ini-production) = 3ee4d2e2e4fb4dbcb5b64df86751f7feeef0e20d
 SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8
 SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3
-SHA1 (patch-sapi_fpm_fpm_events_port.c) = b82b7caffffde1343190fae430a68eb411b5cf8a
+SHA1 (patch-sapi_fpm_fpm_events_port.c) = 9acd2a5eedb19d0d002e7dcbd705c84be91695fa
 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = acf9b4e70d4c5ea2b96e37e7bbf9005379ecc4d0
diff --git a/lang/php74/patches/patch-sapi_fpm_fpm_events_port.c b/lang/php74/patches/patch-sapi_fpm_fpm_events_port.c
index 62ccdd1c6cf..49a2b67a883 100644
--- a/lang/php74/patches/patch-sapi_fpm_fpm_events_port.c
+++ b/lang/php74/patches/patch-sapi_fpm_fpm_events_port.c
@@ -1,28 +1,12 @@
-$NetBSD: patch-sapi_fpm_fpm_events_port.c,v 1.1 2019/12/15 17:56:34 taca Exp $
+$NetBSD: patch-sapi_fpm_fpm_events_port.c,v 1.2 2021/06/03 15:28:49 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	2015-06-23 17:33:33.000000000 +0000
+--- sapi/fpm/fpm/events/port.c.orig	2021-06-01 15:41:57.000000000 +0000
 +++ sapi/fpm/fpm/events/port.c
-@@ -124,6 +124,7 @@ static int fpm_event_port_wait(struct fp
- 	t.tv_nsec = (timeout % 1000) * 1000 * 1000;
- 
- 	/* wait for inconming event or timeout. We want at least one event or timeout */
-+again:
- 	nget = 1;
- 	ret = port_getn(pfd, events, nevents, &nget, &t);
- 	if (ret < 0) {
-@@ -133,17 +134,31 @@ static int fpm_event_port_wait(struct fp
- 			zlog(ZLOG_WARNING, "poll() returns %d", errno);
- 			return -1;
- 		}
-+
-+		if (errno == EINTR)
-+			goto again;
-+
-+		return 0;
+@@ -147,14 +147,23 @@ static int fpm_event_port_wait(struct fp
  	}
  
  	for (i = 0; i < nget; i++) {