Skip to content

Commit

Permalink
src: remove --expose-http2 option
Browse files Browse the repository at this point in the history
This commit removes the --expose-http2 option. In the code comment it
states that this should should be noop through v9.x, and it sounds like
it can be removed for 10.x and above.

PR-URL: #20887
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
danbev committed May 24, 2018
1 parent 9a02de7 commit 3294d1b
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion benchmark/http2/headers.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const bench = common.createBenchmark(main, {
n: [1e3],
nheaders: [0, 10, 100, 1000],
benchmarker: ['h2load']
}, { flags: ['--no-warnings', '--expose-http2'] });
}, { flags: ['--no-warnings'] });

function main({ n, nheaders }) {
const http2 = require('http2');
Expand Down
2 changes: 1 addition & 1 deletion benchmark/http2/respond-with-fd.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const bench = common.createBenchmark(main, {
streams: [100, 200, 1000],
clients: [1, 2],
benchmarker: ['h2load']
}, { flags: ['--no-warnings', '--expose-http2'] });
}, { flags: ['--no-warnings'] });

function main({ requests, streams, clients }) {
fs.open(file, 'r', (err, fd) => {
Expand Down
2 changes: 1 addition & 1 deletion benchmark/http2/simple.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const bench = common.createBenchmark(main, {
streams: [100, 200, 1000],
clients: [1, 2],
benchmarker: ['h2load']
}, { flags: ['--no-warnings', '--expose-http2'] });
}, { flags: ['--no-warnings'] });

function main({ requests, streams, clients }) {
const http2 = require('http2');
Expand Down
2 changes: 1 addition & 1 deletion benchmark/http2/write.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const bench = common.createBenchmark(main, {
length: [64 * 1024, 128 * 1024, 256 * 1024, 1024 * 1024],
size: [100000],
benchmarker: ['h2load']
}, { flags: ['--no-warnings', '--expose-http2'] });
}, { flags: ['--no-warnings'] });

function main({ streams, length, size }) {
const http2 = require('http2');
Expand Down
4 changes: 0 additions & 4 deletions src/node.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3358,7 +3358,6 @@ static void CheckIfAllowedInEnv(const char* exe, bool is_env,
"--experimental-modules",
"--experimental-repl-await",
"--experimental-vm-modules",
"--expose-http2", // keep as a non-op through v9.x
"--force-fips",
"--icu-data-dir",
"--inspect",
Expand Down Expand Up @@ -3608,9 +3607,6 @@ static void ParseArgs(int* argc,
} else if (strcmp(arg, "--expose-internals") == 0 ||
strcmp(arg, "--expose_internals") == 0) {
config_expose_internals = true;
} else if (strcmp(arg, "--expose-http2") == 0 ||
strcmp(arg, "--expose_http2") == 0) {
// Keep as a non-op through v9.x
} else if (strcmp(arg, "-") == 0) {
break;
} else if (strcmp(arg, "--") == 0) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Flags: --expose-http2
'use strict';

const common = require('../common');
Expand Down

0 comments on commit 3294d1b

Please sign in to comment.