Properly concatenate URL components in directory listing.

This time really properly.

TEST=none
http://crbug.com/20347

Review URL: http://codereview.chromium.org/196019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25624 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 2 deletions

diff --git a/net/base/dir_header.html b/net/base/dir_header.html
index 8e885e2..5505831 100644
--- a/net/base/dir_header.html
+++ b/net/base/dir_header.html
@@ -7,12 +7,16 @@ function addRow(name, url, isdir, size, date_modified) {
   if (name == ".")
     return;
 
+  var root = "" + document.location;
+  if (root.substr(-1) !== "/")
+    root += "/";
+
   var table = document.getElementById("table");
   var row = document.createElement("tr");
   var file_cell = document.createElement("td");
   var link = document.createElement("a");
   if (name == "..") {
-    link.href = document.location + "/..";
+    link.href = root + "..";
     link.innerText = document.getElementById("parentDirText").innerText;
     size = "";
     date_modified = "";
@@ -23,7 +27,7 @@ function addRow(name, url, isdir, size, date_modified) {
       size = "";
     }
     link.innerText = name;
-    link.href = document.location + "/" + url;
+    link.href = root + url;
   }
   file_cell.appendChild(link);