From: Tjerk Meesters <datibbaw@php.net>
Date: Tue, 15 Jul 2014 12:28:16 +0000 (+0800)
Subject: Added more useful warning messages
X-Git-Tag: PRE_NATIVE_TLS_MERGE~92^2^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85e2e6c1fdcdf314c17d20321a0fec0bca1b0215;p=php

Added more useful warning messages
---

diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index cdec56bf14..a673974705 100644
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -897,13 +897,24 @@ PHP_FUNCTION(dns_get_record)
 
 			if (n < 0) {
 				php_dns_free_handle(handle);
-				if (h_errno == NO_DATA || h_errno == HOST_NOT_FOUND) {
-					continue;
-				} else {
-					php_error_docref(NULL TSRMLS_CC, E_WARNING, "DNS Query failed");
-					zval_dtor(return_value);
-					RETURN_FALSE;
+				switch (h_errno) {
+					case NO_DATA:
+					case HOST_NOT_FOUND:
+						continue;
+
+					case NO_RECOVERY:
+						php_error_docref(NULL TSRMLS_CC, E_WARNING, "An unexpected server failure occurred.");
+						break;
+
+					case TRY_AGAIN:
+						php_error_docref(NULL TSRMLS_CC, E_WARNING, "A temporary server error occurred.");
+						break;
+
+					default:
+						php_error_docref(NULL TSRMLS_CC, E_WARNING, "DNS Query failed");
 				}
+				zval_dtor(return_value);
+				RETURN_FALSE;
 			}
 
 			cp = answer.qb2 + HFIXEDSZ;