Skip to content

cares: sync with upstream, fully adopt v1.13.0 #15378

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
rvagg wants to merge 7 commits into from
Closed

cares: sync with upstream, fully adopt v1.13.0 #15378

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
58d477a
debs: upgrade to c-ares v1.12.0
rvagg Oct 28, 2016
120fda2
deps: update license-builder & LICENSE for c-ares
rvagg Oct 29, 2016
dff6044
deps: upgrade to c-ares v1.13.0
rvagg Sep 13, 2017
09caa66
deps: c-ares float, manual ares_ssize_t definition
rvagg Sep 13, 2017
12767a7
deps: c-ares float, win ipv6 bad fec0 prefix
rvagg May 15, 2013
2e1ba55
deps: cherry-pick 18ea996 from c-ares upstream
addaleax Jul 15, 2017
b02613f
deps: cherry-pick 0ef4a0c64b6 from c-ares upstream
addaleax Aug 14, 2017
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
Prev Previous commit
deps: cherry-pick 0ef4a0c64b6 from c-ares upstream 
Original commit message:

  gethostbyaddr: fail with `ECANCELLED` for `ares_cancel()`

  When `ares_cancel()` was invoked, `ares_gethostbyaddr()`
  queries would fail with `ENOTFOUND` instead of `ECANCELLED`.

  It seems appropriate to treat `ares_cancel()` like `ares_destroy()`,
  but I would appreciate review of the correctness of this change.

  Ref: #14814

Fixes: #14814

PR-URL: #15023
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  • Loading branch information
@addaleax @rvagg
addaleax authored and rvagg committed Sep 13, 2017
commit b02613f28d623d656335f2798e2d25b5ae4e2cdd
2 changes: 1 addition & 1 deletion deps/cares/src/ares_gethostbyaddr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ static void addr_callback(void *arg, int status, int timeouts,
}
end_aquery(aquery, status, host);
}
else if (status == ARES_EDESTRUCTION)
else if (status == ARES_EDESTRUCTION || status == ARES_ECANCELLED)
end_aquery(aquery, status, NULL);
else
next_lookup(aquery);
Expand Down