From e74558eaea2d41ef217d81b0d363046bc35f52d5 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Wed, 13 Jan 2016 13:17:58 -0700 Subject: [PATCH] browse: Fix for files and dirs with ':' in name --- middleware/browse/browse.go | 2 +- middleware/browse/browse_test.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/middleware/browse/browse.go b/middleware/browse/browse.go index 94741d9b5..a6e8be867 100644 --- a/middleware/browse/browse.go +++ b/middleware/browse/browse.go @@ -196,7 +196,7 @@ func directoryListing(files []os.FileInfo, r *http.Request, canGoUp bool, root s fileCount++ } - url := url.URL{Path: name} + url := url.URL{Path: "./" + name} // prepend with "./" to fix paths with ':' in the name fileinfos = append(fileinfos, FileInfo{ IsDir: f.IsDir(), diff --git a/middleware/browse/browse_test.go b/middleware/browse/browse_test.go index a0c2cb244..f90f4f6f5 100644 --- a/middleware/browse/browse_test.go +++ b/middleware/browse/browse_test.go @@ -147,11 +147,11 @@ func TestBrowseTemplate(t *testing.T) {

/photos/

-test.html
+test.html
-test2.html
+test2.html
-test3.html
+test3.html
@@ -209,7 +209,7 @@ func TestBrowseJson(t *testing.T) { name += "/" } - url := url.URL{Path: name} + url := url.URL{Path: "./" + name} fileinfos = append(fileinfos, FileInfo{ IsDir: f.IsDir(),