diff options
| author | Rod Vagg <rod@vagg.org> | 2018-04-11 21:34:43 +1000 |
|---|---|---|
| committer | Ruben Bridgewater <ruben@bridgewater.de> | 2018-04-16 04:36:40 +0200 |
| commit | b0b7afcfbe0f38715af062ebcb9e1c6bbc68ba68 (patch) | |
| tree | 8aa7fc1874b5fcc5c92aa50106783c737242512d /deps/cares/src/ares_library_init.c | |
| parent | 4a0dff785e766404874c4f171efa85c9508aac5e (diff) | |
| download | android-node-v8-b0b7afcfbe0f38715af062ebcb9e1c6bbc68ba68.tar.gz android-node-v8-b0b7afcfbe0f38715af062ebcb9e1c6bbc68ba68.tar.bz2 android-node-v8-b0b7afcfbe0f38715af062ebcb9e1c6bbc68ba68.zip | |
deps: upgrade to c-ares v1.14.0
* Fix patch for CVE-2017-1000381 to not be overly aggressive.
* win32: Preserve DNS server order returned by Windows when sorting and
exclude DNS servers in legacy subnets.
* win32: Support most recent Visual Studio 2017.
* gethostbyaddr should fail with ECANCELLED not ENOTFOUND when
ares_cancel is called.
* win32: Exclude legacy ipv6 subnets.
* android: Applications compiled for Oreo can no longer use
__system_property_get and must use Java calls to retrieve DNS
servers.
* win32: Force use of ANSI functions.
* CMake minimum version is now 3.1.
* ares_gethostbyname.3: fix callback status values.
* docs: Document WSAStartup requirement.
* Fix a typo in init_by_resolv_conf.
* Android JNI code leaks local references in some cases.
* Force using the ANSI versions of WinAPI functions.
The most important changes have already been included via
* 50e580df21 deps: cherry-pick 0ef4a0c64b6 from c-ares upstream
* 9a0631dffe deps: cherry-pick 18ea996 from c-ares upstream
PR-URL: https://github.com/nodejs/node/pull/19939
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/cares/src/ares_library_init.c')
| -rw-r--r-- | deps/cares/src/ares_library_init.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/deps/cares/src/ares_library_init.c b/deps/cares/src/ares_library_init.c index 0a853d72cf..88e7a53748 100644 --- a/deps/cares/src/ares_library_init.c +++ b/deps/cares/src/ares_library_init.c @@ -30,6 +30,10 @@ fpGetAdaptersAddresses_t ares_fpGetAdaptersAddresses = ZERO_NULL; fpGetBestRoute2_t ares_fpGetBestRoute2 = ZERO_NULL; #endif +#if defined(ANDROID) || defined(__ANDROID__) +#include "ares_android.h" +#endif + /* library-private global vars with source visibility restricted to this file */ static unsigned int ares_initialized; @@ -160,6 +164,10 @@ void ares_library_cleanup(void) if (ares_init_flags & ARES_LIB_INIT_WIN32) ares_win32_cleanup(); +#if defined(ANDROID) || defined(__ANDROID__) + ares_library_cleanup_android(); +#endif + ares_init_flags = ARES_LIB_INIT_NONE; ares_malloc = malloc; ares_realloc = realloc; |