Skip to content

Fix #53092 - dns_get_record does not return false on dns server failure #718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Fix #53092 - dns_get_record does not return false on dns server failure #718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86a4b4e
Fix #53092 - dns_get_record does not return false on dns server failure
datibbaw Jul 13, 2014
72de37b
Changed based on comments and make its behaviour equal to the Windows…
datibbaw Jul 15, 2014
f9414c4
Added more useful warning messages
datibbaw Jul 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion ext/standard/dns.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,24 @@ PHP_FUNCTION(dns_get_record)

if (n < 0) {
php_dns_free_handle(handle);
continue;
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;
Expand Down
2 changes: 1 addition & 1 deletion ext/standard/dns_win32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ PHP_FUNCTION(dns_get_record)
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");
php_error_docref(NULL TSRMLS_CC, E_WARNING, "DNS Query failed");
zval_dtor(return_value);
RETURN_FALSE;
}
Expand Down