[8.x] http2: expose http2 by default, add NODE_NO_HTTP2

benchmark/http2/headers.js

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

benchmark/http2/respond-with-fd.js

@@ -11,7 +11,7 @@ const bench = common.createBenchmark(main, {
   requests: [100, 1000, 10000, 100000, 1000000],
   streams: [100, 200, 1000],
   clients: [1, 2]
-}, { flags: ['--expose-http2', '--no-warnings'] });
+}, { flags: ['--no-warnings'] });
 
 function main(conf) {
 

benchmark/http2/simple.js

@@ -12,7 +12,7 @@ const bench = common.createBenchmark(main, {
   requests: [100, 1000, 10000, 100000],
   streams: [100, 200, 1000],
   clients: [1, 2]
-}, { flags: ['--expose-http2', '--no-warnings'] });
+}, { flags: ['--no-warnings'] });
 
 function main(conf) {
   const n = +conf.requests;

benchmark/http2/write.js

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

doc/api/cli.md

@@ -432,6 +432,13 @@ added: v7.5.0
 
 When set to `1`, process warnings are silenced.
 
+### `NODE_NO_HTTP2=1`
+<!-- YAML
+added: REPLACEME
+-->
+
+When set to `1`, the `http2` module is suppressed.
+
 ### `NODE_OPTIONS=options...`
 <!-- YAML
 added: v8.0.0

doc/api/http2.md

@@ -9,9 +9,6 @@ can be accessed using:
 const http2 = require('http2');
 ```
 
-*Note*: Node.js must be launched with the `--expose-http2` command line flag
-in order to use the `'http2'` module.
-
 ## Core API
 
 The Core API provides a low-level interface designed specifically around

doc/node.1

@@ -130,10 +130,6 @@ Emit pending deprecation warnings.
 .BR \-\-no\-warnings
 Silence all process warnings (including deprecations).
 
-.TP
-.BR \-\-expose\-http2
-Enable the experimental `'http2'` module.
-
 .TP
 .BR \-\-napi\-modules
 Enable loading native modules compiled with the ABI-stable Node.js API (N-API)
@@ -280,6 +276,10 @@ with small\-icu support.
 .BR NODE_NO_WARNINGS =\fI1\fR
 When set to \fI1\fR, process warnings are silenced.
 
+.TP
+.BR NODE_NO_HTTP2 =\fI1\fR
+When set to \fI1\fR, the http2 module is suppressed.
+
 .TP
 .BR NODE_OPTIONS =\fIoptions...\fR
 A space-separated list of command line options. \fBoptions...\fR are interpreted

src/node.cc

@@ -246,8 +246,8 @@ std::string config_warning_file;  // NOLINT(runtime/string)
 // that is used by lib/internal/bootstrap_node.js
 bool config_expose_internals = false;
 
-// Set in node.cc by ParseArgs when --expose-http2 is used.
-bool config_expose_http2 = false;
+// Set to false in node.cc when NODE_NO_HTTP2=1 is used.
+bool config_expose_http2 = true;
 
 bool v8_initialized = false;
 
@@ -3830,7 +3830,6 @@ static void PrintHelp() {
          "  --abort-on-uncaught-exception\n"
          "                             aborting instead of exiting causes a\n"
          "                             core file to be generated for analysis\n"
-         "  --expose-http2             enable experimental HTTP2 support\n"
          "  --trace-warnings           show stack traces on process warnings\n"
          "  --redirect-warnings=file\n"
          "                             write warnings to file instead of\n"
@@ -3894,7 +3893,8 @@ static void PrintHelp() {
 #endif
 #endif
          "NODE_NO_WARNINGS             set to 1 to silence process warnings\n"
-#if !defined(NODE_WITHOUT_NODE_OPTIONS)
+         "NODE_NO_HTTP2                set to 1 to suppress the http2 module\n"
+         #if !defined(NODE_WITHOUT_NODE_OPTIONS)
          "NODE_OPTIONS                 set CLI options in the environment\n"
          "                             via a space-separated list\n"
 #endif
@@ -4173,7 +4173,7 @@ static void ParseArgs(int* argc,
       config_expose_internals = true;
     } else if (strcmp(arg, "--expose-http2") == 0 ||
                strcmp(arg, "--expose_http2") == 0) {
-      config_expose_http2 = true;
+      // Intentional non-op
     } else if (strcmp(arg, "-") == 0) {
       break;
     } else if (strcmp(arg, "--") == 0) {
@@ -4550,6 +4550,12 @@ void Init(int* argc,
         SafeGetenv("NODE_PENDING_DEPRECATION", &text) && text[0] == '1';
   }
 
+  {
+    std::string text;
+    config_expose_http2 =
+      !(SafeGetenv("NODE_NO_HTTP2", &text) && text[0] == '1');
+  }
+
   // Allow for environment set preserving symlinks.
   {
     std::string text;

test/parallel/test-http2-binding.js

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

test/parallel/test-http2-client-data-end.js

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

test/parallel/test-http2-client-destroy.js

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

test/parallel/test-http2-client-onconnect-errors.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const {

test/parallel/test-http2-client-priority-before-connect.js

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

test/parallel/test-http2-client-promisify-connect.js

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

test/parallel/test-http2-client-request-options-errors.js

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

test/parallel/test-http2-client-rststream-before-connect.js

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

test/parallel/test-http2-client-set-priority.js

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

test/parallel/test-http2-client-settings-before-connect.js

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

test/parallel/test-http2-client-shutdown-before-connect.js

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

test/parallel/test-http2-client-socket-destroy.js

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

test/parallel/test-http2-client-stream-destroy-before-connect.js

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

test/parallel/test-http2-client-unescaped-path.js

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

test/parallel/test-http2-client-upload.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 // Verifies that uploading data from a client works

test/parallel/test-http2-client-write-before-connect.js

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

test/parallel/test-http2-compat-errors.js

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

test/parallel/test-http2-compat-expect-continue-check.js

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

test/parallel/test-http2-compat-expect-continue.js

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

test/parallel/test-http2-compat-expect-handling.js

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

test/parallel/test-http2-compat-method-connect.js

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

test/parallel/test-http2-compat-serverrequest-end.js

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

test/parallel/test-http2-compat-serverrequest-headers.js

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

test/parallel/test-http2-compat-serverrequest-pause.js

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

test/parallel/test-http2-compat-serverrequest-pipe.js

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

test/parallel/test-http2-compat-serverrequest-settimeout.js

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

test/parallel/test-http2-compat-serverrequest-trailers.js

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

test/parallel/test-http2-compat-serverrequest.js

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

test/parallel/test-http2-compat-serverresponse-close.js

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

test/parallel/test-http2-compat-serverresponse-createpushresponse.js

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

test/parallel/test-http2-compat-serverresponse-destroy.js

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

test/parallel/test-http2-compat-serverresponse-drain.js

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

test/parallel/test-http2-compat-serverresponse-end.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const {

test/parallel/test-http2-compat-serverresponse-finished.js

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

test/parallel/test-http2-compat-serverresponse-flushheaders.js

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

test/parallel/test-http2-compat-serverresponse-headers.js

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

test/parallel/test-http2-compat-serverresponse-settimeout.js

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

test/parallel/test-http2-compat-serverresponse-statuscode.js

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

test/parallel/test-http2-compat-serverresponse-statusmessage-property-set.js

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

test/parallel/test-http2-compat-serverresponse-statusmessage-property.js

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

test/parallel/test-http2-compat-serverresponse-statusmessage.js

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

test/parallel/test-http2-compat-serverresponse-trailers.js

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

test/parallel/test-http2-compat-serverresponse-write-no-cb.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const { mustCall,

test/parallel/test-http2-compat-serverresponse-writehead.js

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

test/parallel/test-http2-connect-method.js

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

test/parallel/test-http2-connect.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const { mustCall, hasCrypto, skip, expectsError } = require('../common');

test/parallel/test-http2-cookies.js

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

test/parallel/test-http2-create-client-connect.js

@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 // Tests http2.connect()

test/parallel/test-http2-create-client-secure-session.js

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

test/parallel/test-http2-create-client-session.js

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

test/parallel/test-http2-createsecureserver-nooptions.js

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

test/parallel/test-http2-createwritereq.js

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