From 539ffaef8311e5ea1d5c4657bb6fea699b1fe921 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Fri, 21 Apr 2017 20:16:13 -0700 Subject: [PATCH] url: improve descriptiveness of identifier Change variable for protocols that do not always contain `//` to `noLeadingSlashes` so someone reading the code knows what it means. PR-URL: https://github.com/nodejs/node/pull/12579 Reviewed-By: Anna Henningsen Reviewed-By: Richard Lau Reviewed-By: Timothy Gu Reviewed-By: Luigi Pinca Reviewed-By: Daijiro Wachi Reviewed-By: Colin Ihrig Reviewed-By: Gibson Fahnestock Reviewed-By: James M Snell --- lib/url.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/url.js b/lib/url.js index 8314a82427dc04..a53f93ec2de04b 100644 --- a/lib/url.js +++ b/lib/url.js @@ -755,14 +755,14 @@ Url.prototype.resolveObject = function resolveObject(relative) { var removeAllDots = mustEndAbs; var srcPath = result.pathname && result.pathname.split('/') || []; var relPath = relative.pathname && relative.pathname.split('/') || []; - var psychotic = result.protocol && !slashedProtocol[result.protocol]; + var noLeadingSlashes = result.protocol && !slashedProtocol[result.protocol]; // if the url is a non-slashed url, then relative // links like ../.. should be able // to crawl up to the hostname, as well. This is strange. // result.protocol has already been set by now. // Later on, put the first path part into the host field. - if (psychotic) { + if (noLeadingSlashes) { result.hostname = ''; result.port = null; if (result.host) { @@ -810,7 +810,7 @@ Url.prototype.resolveObject = function resolveObject(relative) { // just pull out the search. // like href='?foo'. // Put this after the other two cases because it simplifies the booleans - if (psychotic) { + if (noLeadingSlashes) { result.hostname = result.host = srcPath.shift(); //occasionally the auth can get stuck only in host //this especially happens in cases like @@ -891,7 +891,7 @@ Url.prototype.resolveObject = function resolveObject(relative) { (srcPath[0] && srcPath[0].charAt(0) === '/'); // put the host back - if (psychotic) { + if (noLeadingSlashes) { result.hostname = result.host = isAbsolute ? '' : srcPath.length ? srcPath.shift() : ''; //occasionally the auth can get stuck only in host