squash! http: make parser choice a runtime flag

traditional → legacy
nodejs · Dec 4, 2018 · 9b48c54 · 9b48c54
1 parent 3587d21
commit 9b48c54
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/doc/api/cli.md b/doc/api/cli.md
@@ -127,9 +127,9 @@ added: REPLACEME
 Chooses an HTTP parser library. Available values are:
 
 - `llhttp` for https://llhttp.org/
-- `traditional` for https://github.com/nodejs/http-parser
+- `legacy` for https://github.com/nodejs/http-parser
 
-The default is `traditional`, unless otherwise specified when building Node.js.
+The default is `legacy`, unless otherwise specified when building Node.js.
 
 ### `--icu-data-dir=file`
 <!-- YAML

diff --git a/doc/node.1 b/doc/node.1
@@ -101,7 +101,7 @@ Enable experimental worker threads using worker_threads module.
 Chooses an HTTP parser library. Available values are
 .Sy llhttp
 or
-.Sy traditional .
+.Sy legacy .
 .
 .It Fl -force-fips
 Force FIPS-compliant crypto on startup

diff --git a/lib/_http_common.js b/lib/_http_common.js
@@ -24,7 +24,7 @@
 const { getOptionValue } = require('internal/options');
 
 const { methods, HTTPParser } =
-  getOptionValue('--http-parser') === 'traditional' ?
+  getOptionValue('--http-parser') === 'legacy' ?
     internalBinding('http_parser') : internalBinding('http_parser_llhttp');
 
 const { FreeList } = require('internal/freelist');

diff --git a/src/node_options.cc b/src/node_options.cc
@@ -40,7 +40,7 @@ void EnvironmentOptions::CheckOptions(std::vector<std::string>* errors) {
     errors->push_back("either --check or --eval can be used, not both");
   }
 
-  if (http_parser != "traditional" && http_parser != "llhttp") {
+  if (http_parser != "legacy" && http_parser != "llhttp") {
     errors->push_back("invalid value for --http-parser");
   }
 
@@ -108,11 +108,11 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             kAllowedInEnvironment);
   AddOption("--expose-internals", "", &EnvironmentOptions::expose_internals);
   AddOption("--http-parser",
-            "Select which HTTP parser to use; either 'traditional' or 'llhttp' "
+            "Select which HTTP parser to use; either 'legacy' or 'llhttp' "
 #ifdef NODE_EXPERIMENTAL_HTTP_DEFAULT
             "(default: llhttp).",
 #else
-            "(default: traditional).",
+            "(default: legacy).",
 #endif
             &EnvironmentOptions::http_parser,
             kAllowedInEnvironment);

diff --git a/src/node_options.h b/src/node_options.h
@@ -76,7 +76,7 @@ class EnvironmentOptions : public Options {
 #ifdef NODE_EXPERIMENTAL_HTTP_DEFAULT
     "llhttp";
 #else
-    "traditional";
+    "legacy";
 #endif
   bool no_deprecation = false;
   bool no_force_async_hooks_checks = false;

diff --git a/test/parallel/test-http-parser-lazy-loaded.js b/test/parallel/test-http-parser-lazy-loaded.js
@@ -14,7 +14,7 @@ class DummyParser {
 DummyParser.REQUEST = Symbol();
 
 const binding =
-  getOptionValue('--http-parser') === 'traditional' ?
+  getOptionValue('--http-parser') === 'legacy' ?
     internalBinding('http_parser') : internalBinding('http_parser_llhttp');
 binding.HTTPParser = DummyParser;