From 866375141fa632b77be54b35a860cb6bfe80c202 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Wed, 9 Jan 2019 08:13:57 +0000 Subject: [PATCH] fix: strip baseurl (#626) Former-commit-id: 5daa76063fbd8766115a722336d544d2f6156c74 [formerly 3d644f06b38b6c20f5549b3f2f780556881f216e] [formerly beb819187116079ce83329e85bb1b1d5e6b908ea [formerly 73e0acaa71d749e7742a43a02adc8e3e59051f37]] Former-commit-id: 01dfc4bb6016d6c3de2bb932695e7ca6b9185ff6 [formerly cdee480885c5050d9311f41f39ef7b4feefcc602] Former-commit-id: 82bbfed106ddae78f22d01cabc11f314c19a1796 --- http/data.go | 4 ---- http/http.go | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/http/data.go b/http/data.go index 48cf0a4b..2287afec 100644 --- a/http/data.go +++ b/http/data.go @@ -64,9 +64,5 @@ func handle(fn handleFunc, prefix string, storage *storage.Storage, server *sett } }) - if prefix == "" { - return handler - } - return http.StripPrefix(prefix, handler) } diff --git a/http/http.go b/http/http.go index 2190ac44..7557d479 100644 --- a/http/http.go +++ b/http/http.go @@ -60,5 +60,5 @@ func NewHandler(storage *storage.Storage, server *settings.Server) (http.Handler public.PathPrefix("/dl").Handler(monkey(publicDlHandler, "/api/public/dl/")).Methods("GET") public.PathPrefix("/share").Handler(monkey(publicShareHandler, "/api/public/share/")).Methods("GET") - return r, nil + return http.StripPrefix(server.BaseURL, r), nil }