Skip to content

Commit

Permalink
url: improve descriptiveness of identifier
Browse files Browse the repository at this point in the history
Change variable for protocols that do not always contain `//` to
`noLeadingSlashes` so someone reading the code knows what it means.

PR-URL: #12579
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
Trott authored and evanlucas committed Apr 25, 2017
1 parent ce111ea commit 95a604e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/url.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 95a604e

Please sign in to comment.