1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: remove --expose-http2 option

Browse Source 
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: https://github.com/nodejs/node/pull/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>
This commit is contained in:
Daniel Bevenius 2018-05-22 12:10:53 +02:00
parent 9a02de7084
commit 3294d1bf62
6 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmark/http2/headers.js
View File

@ -7,7 +7,7 @@ const bench = common.createBenchmark(main, {
n: [1e3], n: [1e3],
nheaders: [0, 10, 100, 1000], nheaders: [0, 10, 100, 1000],
benchmarker: ['h2load'] benchmarker: ['h2load']
}, { flags: ['--no-warnings', '--expose-http2'] }); }, { flags: ['--no-warnings'] });
function main({ n, nheaders }) { function main({ n, nheaders }) {
const http2 = require('http2'); const http2 = require('http2');

2
benchmark/http2/respond-with-fd.js
View File

@ -11,7 +11,7 @@ const bench = common.createBenchmark(main, {
streams: [100, 200, 1000], streams: [100, 200, 1000],
clients: [1, 2], clients: [1, 2],
benchmarker: ['h2load'] benchmarker: ['h2load']
}, { flags: ['--no-warnings', '--expose-http2'] }); }, { flags: ['--no-warnings'] });
function main({ requests, streams, clients }) { function main({ requests, streams, clients }) {
fs.open(file, 'r', (err, fd) => { fs.open(file, 'r', (err, fd) => {

2
benchmark/http2/simple.js
View File

@ -10,7 +10,7 @@ const bench = common.createBenchmark(main, {
streams: [100, 200, 1000], streams: [100, 200, 1000],
clients: [1, 2], clients: [1, 2],
benchmarker: ['h2load'] benchmarker: ['h2load']
}, { flags: ['--no-warnings', '--expose-http2'] }); }, { flags: ['--no-warnings'] });
function main({ requests, streams, clients }) { function main({ requests, streams, clients }) {
const http2 = require('http2'); const http2 = require('http2');

2
benchmark/http2/write.js
View File

@ -7,7 +7,7 @@ const bench = common.createBenchmark(main, {
length: [64 * 1024, 128 * 1024, 256 * 1024, 1024 * 1024], length: [64 * 1024, 128 * 1024, 256 * 1024, 1024 * 1024],
size: [100000], size: [100000],
benchmarker: ['h2load'] benchmarker: ['h2load']
}, { flags: ['--no-warnings', '--expose-http2'] }); }, { flags: ['--no-warnings'] });
function main({ streams, length, size }) { function main({ streams, length, size }) {
const http2 = require('http2'); const http2 = require('http2');

4
src/node.cc
View File

@ -3358,7 +3358,6 @@ static void CheckIfAllowedInEnv(const char* exe, bool is_env,
"--experimental-modules", "--experimental-modules",
"--experimental-repl-await", "--experimental-repl-await",
"--experimental-vm-modules", "--experimental-vm-modules",
"--expose-http2", // keep as a non-op through v9.x
"--force-fips", "--force-fips",
"--icu-data-dir", "--icu-data-dir",
"--inspect", "--inspect",
@ -3608,9 +3607,6 @@ static void ParseArgs(int* argc,
} else if (strcmp(arg, "--expose-internals") == 0 || } else if (strcmp(arg, "--expose-internals") == 0 ||
strcmp(arg, "--expose_internals") == 0) { strcmp(arg, "--expose_internals") == 0) {
config_expose_internals = true; 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) { } else if (strcmp(arg, "-") == 0) {
break; break;
} else if (strcmp(arg, "--") == 0) { } else if (strcmp(arg, "--") == 0) {

1
test/parallel/test-http2-https-fallback-http-server-options.js
View File

@ -1,4 +1,3 @@
// Flags: --expose-http2
'use strict'; 'use strict';
const common = require('../common'); const common = require('../common');