Part fix for bug #49224

diff --git a/NEWS b/NEWS
index 7d2586abb200fa1acb85a8e56a242347659be19d..65d533e5ed010882c6b4199de933c1045e4cd28f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -40,6 +40,8 @@ PHP                                                                        NEWS
   cannot be set"). (Felipe)
 - Fixed bug #49517 (cURL's CURLOPT_FILE prevents file from being deleted after
   fclose). (Ilia)
+- Fixed bug #49224 (Compile error due to old DNS functions on AIX systems).
+  (Scott)
 - Fixed bug #48805 (IPv6 socket transport is not working). (Ilia)
 - Fixed PECL bug #16842 (oci_error return false when NO_DATA_FOUND is raised).
   (Chris Jones)

diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index dd7a8b15b0b197fab34621df317cac1d55212f9a..da036ab087de5475bda745584ab80868d78cea35 100644 (file)
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -810,14 +810,8 @@ PHP_FUNCTION(dns_get_record)
                        n = php_dns_search(handle, hostname, C_IN, type_to_fetch, answer.qb2, sizeof answer);
 
                        if (n < 0) {
-                               if (php_dns_errno(handle) == NO_DATA) {
-                                       php_dns_free_handle(handle);
-                                       continue;
-                               }
-
                                php_dns_free_handle(handle);
-                               zval_dtor(return_value);
-                               RETURN_FALSE;
+                               continue;
                        }
 
                        cp = answer.qb2 + HFIXEDSZ;

diff --git a/ext/standard/php_dns.h b/ext/standard/php_dns.h
index 44963717276e42415830590de8d1436c07e61b6d..74b676d8c1b1b9bda54409783cbb59027fda0bb2 100644 (file)
--- a/ext/standard/php_dns.h
+++ b/ext/standard/php_dns.h
@@ -28,8 +28,6 @@
        ((int)dns_search(res, dname, class, type, answer, anslen, (struct sockaddr *)&from, &fromsize))
 #define php_dns_free_handle(res) \
                dns_free(res)
-#define php_dns_errno(_res) \
-                       (NO_DATA)
 
 #elif defined(HAVE_RES_NSEARCH)
 #define php_dns_search(res, dname, class, type, answer, anslen) \
@@ -37,15 +35,11 @@
 #define php_dns_free_handle(res) \
                        res_nclose(res); \
                        php_dns_free_res(*res)
-#define php_dns_errno(res) \
-                       (res->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(res) \
-                       (_res.res_h_errno)
 
 #endif