http: optimize default method case

mscdex · mscdex · commit dab22b5b7ab6 · 2017-01-13T16:11:18.000-05:00
PR-URL: nodejs#10654 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
diff --git a/lib/_http_client.js b/lib/_http_client.js
@@ -105,13 +105,20 @@ function ClientRequest(options, cb) {
   self.timeout = options.timeout;
 
   var method = options.method;
-  if (method != null && typeof method !== 'string') {
+  var methodIsString = (typeof method === 'string');
+  if (method != null && !methodIsString) {
     throw new TypeError('Method must be a string');
   }
-  method = self.method = (method || 'GET').toUpperCase();
-  if (!common._checkIsHttpToken(method)) {
-    throw new TypeError('Method must be a valid HTTP token');
+
+  if (methodIsString && method) {
+    if (!common._checkIsHttpToken(method)) {
+      throw new TypeError('Method must be a valid HTTP token');
+    }
+    method = self.method = method.toUpperCase();
+  } else {
+    method = self.method = 'GET';
   }
+
   self.path = options.path || '/';
   if (cb) {
     self.once('response', cb);
diff --git a/lib/_http_common.js b/lib/_http_common.js
@@ -265,8 +265,6 @@ var validTokens = [
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0  // ... 255
 ];
 function checkIsHttpToken(val) {
-  if (typeof val !== 'string' || val.length === 0)
-    return false;
   if (!validTokens[val.charCodeAt(0)])
     return false;
   if (val.length < 2)
diff --git a/lib/_http_outgoing.js b/lib/_http_outgoing.js
@@ -314,21 +314,21 @@ function _storeHeader(firstLine, headers) {
   if (state.expect) this._send('');
 }
 
-function storeHeader(self, state, field, value, validate) {
+function storeHeader(self, state, key, value, validate) {
   if (validate) {
-    if (!checkIsHttpToken(field)) {
+    if (typeof key !== 'string' || !key || !checkIsHttpToken(key)) {
       throw new TypeError(
-        'Header name must be a valid HTTP Token ["' + field + '"]');
+        'Header name must be a valid HTTP Token ["' + key + '"]');
     }
     if (value === undefined) {
-      throw new Error('Header "%s" value must not be undefined', field);
+      throw new Error('Header "%s" value must not be undefined', key);
     } else if (checkInvalidHeaderChar(value)) {
-      debug('Header "%s" contains invalid characters', field);
+      debug('Header "%s" contains invalid characters', key);
       throw new TypeError('The header content contains invalid characters');
     }
   }
-  state.header += field + ': ' + escapeHeaderValue(value) + CRLF;
-  matchHeader(self, state, field, value);
+  state.header += key + ': ' + escapeHeaderValue(value) + CRLF;
+  matchHeader(self, state, key, value);
 }
 
 function matchConnValue(self, state, value) {
@@ -374,7 +374,7 @@ function matchHeader(self, state, field, value) {
 }
 
 function validateHeader(msg, name, value) {
-  if (!checkIsHttpToken(name))
+  if (typeof name !== 'string' || !name || !checkIsHttpToken(name))
     throw new TypeError(
       'Header name must be a valid HTTP Token ["' + name + '"]');
   if (value === undefined)
@@ -568,7 +568,7 @@ OutgoingMessage.prototype.addTrailers = function addTrailers(headers) {
       field = key;
       value = headers[key];
     }
-    if (!checkIsHttpToken(field)) {
+    if (typeof field !== 'string' || !field || !checkIsHttpToken(field)) {
       throw new TypeError(
         'Trailer name must be a valid HTTP Token ["' + field + '"]');
     }

Original file line number	Diff line number	Diff line change
`@@ -314,21 +314,21 @@ function _storeHeader(firstLine, headers) {`
`314`	`314`	`if (state.expect) this._send('');`
`315`	`315`	`}`
`316`	`316`
`317`		`-function storeHeader(self, state, field, value, validate) {`
	`317`	`+function storeHeader(self, state, key, value, validate) {`
`318`	`318`	`if (validate) {`
`319`		`- if (!checkIsHttpToken(field)) {`
	`319`	`+ if (typeof key !== 'string' \|\| !key \|\| !checkIsHttpToken(key)) {`
`320`	`320`	`throw new TypeError(`
`321`		`- 'Header name must be a valid HTTP Token ["' + field + '"]');`
	`321`	`+ 'Header name must be a valid HTTP Token ["' + key + '"]');`
`322`	`322`	`}`
`323`	`323`	`if (value === undefined) {`
`324`		`- throw new Error('Header "%s" value must not be undefined', field);`
	`324`	`+ throw new Error('Header "%s" value must not be undefined', key);`
`325`	`325`	`} else if (checkInvalidHeaderChar(value)) {`
`326`		`- debug('Header "%s" contains invalid characters', field);`
	`326`	`+ debug('Header "%s" contains invalid characters', key);`
`327`	`327`	`throw new TypeError('The header content contains invalid characters');`
`328`	`328`	`}`
`329`	`329`	`}`
`330`		`- state.header += field + ': ' + escapeHeaderValue(value) + CRLF;`
`331`		`- matchHeader(self, state, field, value);`
	`330`	`+ state.header += key + ': ' + escapeHeaderValue(value) + CRLF;`
	`331`	`+ matchHeader(self, state, key, value);`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`function matchConnValue(self, state, value) {`
`@@ -374,7 +374,7 @@ function matchHeader(self, state, field, value) {`
`374`	`374`	`}`
`375`	`375`
`376`	`376`	`function validateHeader(msg, name, value) {`
`377`		`- if (!checkIsHttpToken(name))`
	`377`	`+ if (typeof name !== 'string' \|\| !name \|\| !checkIsHttpToken(name))`
`378`	`378`	`throw new TypeError(`
`379`	`379`	`'Header name must be a valid HTTP Token ["' + name + '"]');`
`380`	`380`	`if (value === undefined)`
`@@ -568,7 +568,7 @@ OutgoingMessage.prototype.addTrailers = function addTrailers(headers) {`
`568`	`568`	`field = key;`
`569`	`569`	`value = headers[key];`
`570`	`570`	`}`
`571`		`- if (!checkIsHttpToken(field)) {`
	`571`	`+ if (typeof field !== 'string' \|\| !field \|\| !checkIsHttpToken(field)) {`
`572`	`572`	`throw new TypeError(`
`573`	`573`	`'Trailer name must be a valid HTTP Token ["' + field + '"]');`
`574`	`574`	`}`