Attachment 229456 Details for Bug 259725 – php80 patch

[patch] php80 patch

0001-lang-php80-Fix-dns_get_record-glitch-when-requested-.patch (text/plain), 3.25 KB, created by fsbruva on 2021-11-12 20:55:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: fsbruva

Created: 2021-11-12 20:55:18 UTC

Size: 3.25 KB

patch

obsolete

>From 6daffdcef5a9fe8ad7e20036f79dacccc1df676b Mon Sep 17 00:00:00 2001
>From: Matt <fsbruva@yahoo.com>
>Date: Fri, 12 Nov 2021 15:53:37 -0500
>Subject: [PATCH] lang/php80: Fix dns_get_record glitch when requested record
> doesn't exist
>
>Correct behavior of dns_get_record to return all available requested records,
>even if one or more record types do not exist for the domain. Currently, the
>function returns boolean false, failing to return any valid records if one
>of the requested record types doesn't exist.
>
>Upstream bug reports:
>https://bugs.php.net/bug.php?id=70027
>https://bugs.php.net/bug.php?id=81618
>
>PR:	259725
>---
> lang/php80/Makefile                           |  2 +-
> lang/php80/files/patch-ext_standard_dns.c     | 21 ++++++++++++++++
> .../php80/files/patch-ext_standard_php__dns.h | 24 +++++++++++++++++++
> 3 files changed, 46 insertions(+), 1 deletion(-)
> create mode 100644 lang/php80/files/patch-ext_standard_dns.c
> create mode 100644 lang/php80/files/patch-ext_standard_php__dns.h
>
>diff --git a/lang/php80/Makefile b/lang/php80/Makefile
>index 7e9acf6c4607..254f0467cc7f 100644
>--- a/lang/php80/Makefile
>+++ b/lang/php80/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	php80
> DISTVERSION=	8.0.12
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> CATEGORIES?=	lang devel www
> MASTER_SITES=	PHP/distributions
> DISTNAME=	php-${DISTVERSION}
>diff --git a/lang/php80/files/patch-ext_standard_dns.c b/lang/php80/files/patch-ext_standard_dns.c
>new file mode 100644
>index 000000000000..58acda6824e1
>--- /dev/null
>+++ b/lang/php80/files/patch-ext_standard_dns.c
>@@ -0,0 +1,21 @@
>+--- ext/standard/dns.c.orig	2021-10-19 10:34:32 UTC
>++++ ext/standard/dns.c
>+@@ -798,6 +798,7 @@ PHP_FUNCTION(dns_get_record)
>+ 	zend_long type_param = PHP_DNS_ANY;
>+ 	zval *authns = NULL, *addtl = NULL;
>+ 	int type_to_fetch;
>++	int dns_errno;
>+ #if defined(HAVE_DNS_SEARCH)
>+ 	struct sockaddr_storage from;
>+ 	uint32_t fromsize = sizeof(from);
>+@@ -946,8 +947,9 @@ PHP_FUNCTION(dns_get_record)
>+ 			n = php_dns_search(handle, hostname, C_IN, type_to_fetch, answer.qb2, sizeof answer);
>+ 
>+ 			if (n < 0) {
>++				dns_errno = php_dns_errno(handle);
>+ 				php_dns_free_handle(handle);
>+-				switch (h_errno) {
>++				switch (dns_errno) {
>+ 					case NO_DATA:
>+ 					case HOST_NOT_FOUND:
>+ 						continue;
>diff --git a/lang/php80/files/patch-ext_standard_php__dns.h b/lang/php80/files/patch-ext_standard_php__dns.h
>new file mode 100644
>index 000000000000..11ebd188624e
>--- /dev/null
>+++ b/lang/php80/files/patch-ext_standard_php__dns.h
>@@ -0,0 +1,24 @@
>+--- ext/standard/php_dns.h.orig	2021-10-19 10:34:32 UTC
>++++ ext/standard/php_dns.h
>+@@ -24,6 +24,7 @@
>+     	((int)dns_search(res, dname, class, type, (char *) answer, anslen, (struct sockaddr *)&from, &fromsize))
>+ #define php_dns_free_handle(res) \
>+ 		dns_free(res)
>++#define php_dns_errno(handle) h_errno
>+ 
>+ #elif defined(HAVE_RES_NSEARCH)
>+ #define php_dns_search(res, dname, class, type, answer, anslen) \
>+@@ -37,11 +38,13 @@
>+ 			res_nclose(res); \
>+ 			php_dns_free_res(res)
>+ #endif
>++#define php_dns_errno(handle) handle->res_h_errno
>+ 
>+ #elif defined(HAVE_RES_SEARCH)
>+ #define php_dns_search(res, dname, class, type, answer, anslen) \
>+ 			res_search(dname, class, type, answer, anslen)
>+ #define php_dns_free_handle(res) /* noop */
>++#define php_dns_errno(handle) h_errno
>+ 
>+ #endif
>+ 
>-- 
>2.33.1
>

Actions: View | Diff

Attachments on bug 259725: 229369 | 229454 | 229455 | 229456