From da7f3cd43f50cefb528c721b781ac21a98e1224f Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Sun, 16 Apr 2017 09:33:10 +0100 Subject: [PATCH] fix simple bug Former-commit-id: cb4d103e6becd16d3b750c114851a49a30a3b479 [formerly 43dfdf05fc13e80371c712678ad7e3c616f0cf71] [formerly 352bb297a3f0c4f485164587c08669e221f5a111 [formerly 2640977611aa0c9f610a4a9e49144a64a1db141f]] Former-commit-id: 59978a47bc505d5ed7212d67d26e54c152e7b26a [formerly b0631a2a9c572397fe6e142f0e1b3975eee6039f] Former-commit-id: 39290bebbe7c404492cd3d51dabeaf2d30c1b7ad --- config/config.go | 3 +-- page/version.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config/config.go b/config/config.go index 68795b23..bfad2ad7 100644 --- a/config/config.go +++ b/config/config.go @@ -120,7 +120,6 @@ func Parse(c *caddy.Controller) ([]Config, error) { prefix := c.Val() prefix = strings.TrimPrefix(prefix, "/") prefix = strings.TrimSuffix(prefix, "/") - prefix = cfg.BaseURL + "/" + prefix cfg.WebDavURL = prefix case "show": if !c.NextArg() { @@ -246,7 +245,7 @@ func Parse(c *caddy.Controller) ([]Config, error) { caddyConf := httpserver.GetConfig(c) cfg.PrefixURL = strings.TrimSuffix(caddyConf.Addr.Path, "/") - cfg.WebDavURL = "/" + strings.TrimPrefix(cfg.WebDavURL, "/") + cfg.WebDavURL = cfg.BaseURL + "/" + strings.TrimPrefix(cfg.WebDavURL, "/") cfg.Handler = &webdav.Handler{ Prefix: cfg.WebDavURL, FileSystem: cfg.FileSystem, diff --git a/page/version.go b/page/version.go index 2c81d95c..4f8837ed 100644 --- a/page/version.go +++ b/page/version.go @@ -1,5 +1,5 @@ package page -var GIT_COMMIT_HASH = "e46a007" +var GIT_COMMIT_HASH = "056ea2b" var CIRCLE_BUILD_NUM = "" -var GENERATED int64 = 1492261242791293300 +var GENERATED int64 = 1492331591719476600