Skip to content

Commit

Permalink
src: fix --without-ssl build
Browse files Browse the repository at this point in the history
ProcessArgv referenced fields on PerProcessOptions that aren't there
when the build is configured --without-ssl.

PR-URL: #22484
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
ianloic authored and targos committed Sep 3, 2018
1 parent 2767eba commit 034ba73
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/node.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2729,12 +2729,14 @@ void ProcessArgv(std::vector<std::string>* args,
exit(9);
}

#if HAVE_OPENSSL
if (per_process_opts->use_openssl_ca && per_process_opts->use_bundled_ca) {
fprintf(stderr, "%s: either --use-openssl-ca or --use-bundled-ca can be "
"used, not both\n",
args->at(0).c_str());
exit(9);
}
#endif

if (std::find(v8_args.begin(), v8_args.end(),
"--abort-on-uncaught-exception") != v8_args.end() ||
Expand Down

0 comments on commit 034ba73

Please sign in to comment.