- fix bug #52260, catch all DNS not found error

diff --git a/NEWS b/NEWS
index 339a9b66386d769d41dd3172f1b62a904d5a2582..051a60b0fbf0c6779d3406e4a1bfb35c7f8d56eb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -67,6 +67,8 @@
 - Fixed bug #50590 (IntlDateFormatter::parse result is limited to the integer
   range). (Stas)
 - Fixed bug #50481 (Storing many SPLFixedArray in an array crashes). (Felipe)
+- Fixed bug #52260 (dns_get_record fails with non-existing domain on Windows).
+  (a_jelly_doughnut at phpbb dot com, Pierre)
 
 22 Jul 2010, PHP 5.3.3
 - Upgraded bundled sqlite to version 3.6.23.1. (Ilia)

diff --git a/ext/standard/dns_win32.c b/ext/standard/dns_win32.c
index bd12c4adea49c1cc3e042739c0bc4ed46bad496f..ac3aab00b17aa05bded1ab70e7798275a997dd80 100644 (file)
--- a/ext/standard/dns_win32.c
+++ b/ext/standard/dns_win32.c
@@ -418,7 +418,7 @@ PHP_FUNCTION(dns_get_record)
                        status = DnsQuery_A(hostname, type_to_fetch, DNS_QUERY_STANDARD, NULL, &pResult, NULL);
 
                        if (status) {
-                               if (status == DNS_INFO_NO_RECORDS) {
+                               if (status == DNS_INFO_NO_RECORDS || status == DNS_ERROR_RCODE_NAME_ERROR) {
                                        continue;
                                } else {
                                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Dns Query failed");