(bugfix) dns.c: Correct dns_get_record on FreeBSD - Fix #81618 #7653
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Modify dns_get_record to test for query result based on dns_errno to accommodate modern FreeBSD, for which res_nsearch() does not update h_errno directly. Add new php_dns_errno function, and have it consult statp->res_h_errno when OS has res_nsearch(). Fixes #81618
|
might be better if you branch from |
Good catch about macro - edited.
Oops, you're right.. I see the git workflow now. Let me see about correcting that. |
|
I'll rebase, then shift the PR base... |
|
Nevermind. I'll submit a PR for a commit off the 7.3 branch. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Modify dns_get_record to test for query result based on dns_errno to
accommodate modern FreeBSD, for which res_nsearch() does not update
h_errno directly. Add new php_dns_errno macro, and have it consult
statp->res_h_errno when OS has res_nsearch().
Fixes #81618
This approach is more complete than #7650, because it deals with the
general case for any subsequent or future calls to php_dns_errno().
Test borrowed from #7650.
Will need to be backported to 8.1, 7.3 and 7.4 branches.