Skip to content
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.

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

switch from c-ares to getdns #38184

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 3 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

# net

/deps/cares @nodejs/net
/deps/getdns @nodejs/net
/doc/api/dns.md @nodejs/net
/doc/api/dgram.md @nodejs/net
/doc/api/net.md @nodejs/net
Expand All @@ -45,9 +45,10 @@
/lib/internal/net.js @nodejs/net
/lib/internal/socket_list.js @nodejs/net
/lib/internal/js_stream_socket.js @nodejs/net
/src/cares_wrap.cc @nodejs/net
/src/connect_wrap.* @nodejs/net
/src/connection_wrap.* @nodejs/net
/src/node_dns.cc @nodejs/net
/src/node_dns.h @nodejs/net
/src/node_sockaddr* @nodejs/net
/src/tcp_wrap.* @nodejs/net
/src/udp_wrap.* @nodejs/net
Expand Down
36 changes: 22 additions & 14 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -99,21 +99,29 @@ The externally maintained libraries used by Node.js are:
THE SOFTWARE.
"""

- c-ares, located at deps/cares, is licensed as follows:
- getdns, located at deps/getdns, is licensed as follows:
"""
Copyright (c) 2007 - 2018, Daniel Stenberg with many contributors, see AUTHORS
file.

Copyright 1998 by the Massachusetts Institute of Technology.

Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted, provided that
the above copyright notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting documentation, and that
the name of M.I.T. not be used in advertising or publicity pertaining to
distribution of the software without specific, written prior permission.
M.I.T. makes no representations about the suitability of this software for any
purpose. It is provided "as is" without express or implied warranty.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the names of the copyright holders nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL Verisign, Inc. BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""

- cjs-module-lexer, located at deps/cjs-module-lexer, is licensed as follows:
Expand Down
29 changes: 14 additions & 15 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -394,27 +394,26 @@
dest='shared_brotli_libpath',
help='a directory to search for the shared brotli DLL')

shared_optgroup.add_argument('--shared-cares',
shared_optgroup.add_argument('--shared-getdns',
action='store_true',
dest='shared_cares',
default=None,
help='link to a shared cares DLL instead of static linking')
dest='shared_getdns',
help='link to a shared getdns DLL instead of static linking')

shared_optgroup.add_argument('--shared-cares-includes',
shared_optgroup.add_argument('--shared-getdns-includes',
action='store',
dest='shared_cares_includes',
help='directory containing cares header files')
dest='shared_getdns_includes',
help='directory containing getdns header files')

shared_optgroup.add_argument('--shared-cares-libname',
shared_optgroup.add_argument('--shared-getdns-libname',
action='store',
dest='shared_cares_libname',
default='cares',
help='alternative lib name to link to [default: %(default)s]')
dest='shared_getdns_libname',
default='getdns',
help='alternative lib name to link to [default: %default]')

shared_optgroup.add_argument('--shared-cares-libpath',
shared_optgroup.add_argument('--shared-getdns-libpath',
action='store',
dest='shared_cares_libpath',
help='a directory to search for the shared cares DLL')
dest='shared_getdns_libpath',
help='a directory to search for the shared getdns DLL')

parser.add_argument_group(shared_optgroup)

Expand Down Expand Up @@ -1880,10 +1879,10 @@ def make_bin_override():
configure_library('http_parser', output)
configure_library('libuv', output)
configure_library('brotli', output, pkgname=['libbrotlidec', 'libbrotlienc'])
configure_library('cares', output, pkgname='libcares')
configure_library('nghttp2', output, pkgname='libnghttp2')
configure_library('nghttp3', output, pkgname='libnghttp3')
configure_library('ngtcp2', output, pkgname='libngtcp2')
configure_library('getdns', output)
configure_v8(output)
configure_openssl(output)
configure_intl(output)
Expand Down
19 changes: 0 additions & 19 deletions deps/cares/.gitignore

This file was deleted.

15 changes: 0 additions & 15 deletions deps/cares/LICENSE.md

This file was deleted.

186 changes: 0 additions & 186 deletions deps/cares/cares.gyp

This file was deleted.

Loading