diff options
| author | Julien Gilli <julien.gilli@joyent.com> | 2015-03-16 15:55:17 -0700 |
|---|---|---|
| committer | Julien Gilli <julien.gilli@joyent.com> | 2015-03-16 15:55:17 -0700 |
| commit | ae58fc407f916b2abb164453a5b09273c543dbc3 (patch) | |
| tree | 4a16fe73f996a54f34cfb553b2995d16c1375b7f /lib/url.js | |
| parent | 2b64132101f179c30957e3c5f16fc47a8ec942e1 (diff) | |
| parent | eb2764a9452baa7cba2d98dc34fa00fc776b0a12 (diff) | |
| download | node-merge-review.tar.gz | |
Merge remote-tracking branch 'upstream/v0.12'merge-review
Diffstat (limited to 'lib/url.js')
| -rw-r--r-- | lib/url.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/url.js b/lib/url.js index c5a3793b9..1c7506023 100644 --- a/lib/url.js +++ b/lib/url.js @@ -641,8 +641,8 @@ Url.prototype.resolveObject = function(relative) { // then it must NOT get a trailing slash. var last = srcPath.slice(-1)[0]; var hasTrailingSlash = ( - (result.host || relative.host || srcPath.length > 1) && - (last === '.' || last === '..') || last === ''); + (result.host || relative.host) && (last === '.' || last === '..') || + last === ''); // strip single dots, resolve double dots to parent dir // if the path tries to go above the root, `up` ends up > 0 |