summaryrefslogtreecommitdiff
path: root/lang/php80/files
diff options
context:
space:
mode:
authorTorsten Zuehlsdorff <tz@FreeBSD.org>2021-11-20 20:29:48 +0100
committerTorsten Zuehlsdorff <tz@FreeBSD.org>2021-11-20 20:31:39 +0100
commit91fd937f88cae37d468aa1973dd88232c2fb498c (patch)
tree0f1276dc74e26eb1f4a9894704376cafc9733b93 /lang/php80/files
parentlang/php74: Upgrade from 7.4.25 to 7.4.26 (diff)
lang/php80: Upgrade from 8.0.12 to 8.0.13
Core: Fixed bug #81518 (Header injection via default_mimetype / default_charset). Date: Fixed bug #81500 (Interval serialization regression since 7.3.14 / 7.4.2). DBA: Fixed bug #81588 (TokyoCabinet driver leaks memory). MBString: Fixed bug #76167 (mbstring may use pointer from some previous request). Opcache: Fixed bug #81512 (Unexpected behavior with arrays and JIT). PCRE: Fixed bug #81424 (PCRE2 10.35 JIT performance regression). XML: Fixed bug #79971 (special character is breaking the path in xml function). (CVE-2021-21707) XMLReader: Fixed bug #81521 (XMLReader::getParserProperty may throw with a valid property). Also include a patch to fix issue 259725: dns_get_record fails when requested record doesn't exist PR: 259725 Reported by: fsbruva@yahoo.com Sponsored by: Bounce Experts
Diffstat (limited to 'lang/php80/files')
-rw-r--r--lang/php80/files/patch-ext_standard_dns.c21
-rw-r--r--lang/php80/files/patch-ext_standard_php__dns.h24
2 files changed, 45 insertions, 0 deletions
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
+