Skip to content

(v6.x backport) dns: fix resolve failed starts without network #14434

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

(v6.x backport) dns: fix resolve failed starts without network #14434

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b80aedf
net: support passing undefined to listen()
sam-github Jul 14, 2017
02e0b1a
src: make root_cert_vector function scoped
danbev May 2, 2017
f4691bb
crypto: remove root_cert_store from node_crypto.h
danbev May 24, 2017
14e4254
deps: backport rehash strings after deserialization
hashseed Jul 20, 2017
b706569
dns: fix `resolve` failed starts without network
XadillaX Aug 10, 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
Next Next commit
src: make root_cert_vector function scoped 
root_cert_vector currently has file scope and external linkage, but is
only used in the NewRootCertsStore function. If this is not required to
be externally linked perhaps it can be changed to be static and function
scoped instead.

PR-URL: #12788
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
  • Loading branch information
@danbev @MylesBorins
danbev authored and MylesBorins committed Aug 1, 2017
commit 02e0b1ac3c88dd83adafaebee91d83ea2a83d283
2 changes: 1 addition & 1 deletion src/node_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ const char* const root_certs[] = {
std::string extra_root_certs_file; // NOLINT(runtime/string)

X509_STORE* root_cert_store;
std::vector<X509*> root_certs_vector;

// Just to generate static methods
template class SSLWrap<TLSWrap>;
Expand Down Expand Up @@ -710,6 +709,7 @@ static int X509_up_ref(X509* cert) {


static X509_STORE* NewRootCertStore() {
static std::vector<X509*> root_certs_vector;
if (root_certs_vector.empty()) {
for (size_t i = 0; i < arraysize(root_certs); i++) {
BIO* bp = NodeBIO::NewFixed(root_certs[i], strlen(root_certs[i]));
Expand Down