com php-src: Added more useful warning messages: ext/standard/dns.c
| From: | Stanislav Malyshev | Date: | Mon, 01 Dec 2014 06:42:31 +0000 |
| Subject: | com php-src: Added more useful warning messages: ext/standard/dns.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83446@lists.php.net to get a copy of this message | ||
Commit: 7ccd7b5975df0d3bb7c06af6f7491d2d2971409f
Author: Tjerk Meesters <datibbaw@php.net> Tue, 15 Jul 2014 20:28:16 +0800
Committer: Stanislav Malyshev <stas@php.net> Sun, 30 Nov 2014 22:42:31 -0800
Parents: 0109eb07cf251e8c66d428e612f2b747e7e68a44
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7ccd7b5975df0d3bb7c06af6f7491d2d2971409f
Log:
Added more useful warning messages
Changed paths:
M ext/standard/dns.c
Diff:
diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index 7060d3f..37cad8b 100644
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -896,13 +896,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;