github
/
filebrowser
mirror of https://github.com/filebrowser/filebrowser
1
0
Fork 0
Code Issues Releases Wiki Activity

fix simple bug

pull/144/head
Henrique Dias 2017-04-16 09:33:10 +01:00
parent 056ea2b8bd
commit 2640977611
No known key found for this signature in database
GPG Key ID: 936F5EB68D786730
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.go
View File

@ -120,7 +120,6 @@ func Parse(c *caddy.Controller) ([]Config, error) {
prefix := c.Val() prefix := c.Val()
prefix = strings.TrimPrefix(prefix, "/") prefix = strings.TrimPrefix(prefix, "/")
prefix = strings.TrimSuffix(prefix, "/") prefix = strings.TrimSuffix(prefix, "/")
prefix = cfg.BaseURL + "/" + prefix
cfg.WebDavURL = prefix cfg.WebDavURL = prefix
case "show": case "show":
if !c.NextArg() { if !c.NextArg() {
@ -246,7 +245,7 @@ func Parse(c *caddy.Controller) ([]Config, error) {
caddyConf := httpserver.GetConfig(c) caddyConf := httpserver.GetConfig(c)
cfg.PrefixURL = strings.TrimSuffix(caddyConf.Addr.Path, "/") 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{ cfg.Handler = &webdav.Handler{
Prefix: cfg.WebDavURL, Prefix: cfg.WebDavURL,
FileSystem: cfg.FileSystem, FileSystem: cfg.FileSystem,

4
page/version.go
View File

@ -1,5 +1,5 @@
package page package page
var GIT_COMMIT_HASH = "e46a007" var GIT_COMMIT_HASH = "056ea2b"
var CIRCLE_BUILD_NUM = "" var CIRCLE_BUILD_NUM = ""
var GENERATED int64 = 1492261242791293300 var GENERATED int64 = 1492331591719476600