From 3f99a9236a4d52ea6971c847f54f93137ed162d2 Mon Sep 17 00:00:00 2001
From: Amir Saboury <amir.saboury@gmail.com>
Date: Sun, 11 Jan 2015 17:55:12 -0500
Subject: [PATCH] url: reslove urls with . and ..

'.' and '..' are directory specs and resolving urls with or without
the hostname with '.' and '..' should add a trailing slash to the
end of the url.

Fix #8992
---
 lib/url.js              | 4 ++--
 test/simple/test-url.js | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/url.js b/lib/url.js
index 4c0ef0102fa..963370aa2e6 100644
--- a/lib/url.js
+++ b/lib/url.js
@@ -629,8 +629,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) && (last === '.' || last === '..') ||
-      last === '');
+      (result.host || relative.host || srcPath.length > 1) &&
+      (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
diff --git a/test/simple/test-url.js b/test/simple/test-url.js
index 3271b0ba21a..8e9f4530478 100644
--- a/test/simple/test-url.js
+++ b/test/simple/test-url.js
@@ -1112,6 +1112,14 @@ var relativeTests = [
   ['/foo/bar/baz/', 'quux/baz', '/foo/bar/baz/quux/baz'],
   ['/foo/bar/baz', '../../../../../../../../quux/baz', '/quux/baz'],
   ['/foo/bar/baz', '../../../../../../../quux/baz', '/quux/baz'],
+  ['/foo', '.', '/'],
+  ['/foo', '..', '/'],
+  ['/foo/', '.', '/foo/'],
+  ['/foo/', '..', '/'],
+  ['/foo/bar', '.', '/foo/'],
+  ['/foo/bar', '..', '/'],
+  ['/foo/bar/', '.', '/foo/bar/'],
+  ['/foo/bar/', '..', '/foo/'],
   ['foo/bar', '../../../baz', '../../baz'],
   ['foo/bar/', '../../../baz', '../baz'],
   ['http://example.com/b//c//d;p?q#blarg', 'https:#hash2', 'https:///#hash2'],