Skip to content

Commit 58edf68

Browse files
committed
no need for abs path flag param
1 parent 2e41852 commit 58edf68

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

server/handlers.go

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ func (s *Server) previewHandler(w http.ResponseWriter, r *http.Request) {
157157
}
158158

159159
relativeURL, _ := url.Parse(path.Join(s.proxyPath, token, filename))
160-
resolvedURL := resolveURL(r, relativeURL, true)
160+
resolvedURL := resolveURL(r, relativeURL)
161161
relativeURLGet, _ := url.Parse(path.Join(s.proxyPath, getPathPart, token, filename))
162-
resolvedURLGet := resolveURL(r, relativeURLGet, true)
162+
resolvedURLGet := resolveURL(r, relativeURLGet)
163163
var png []byte
164164
png, err = qrcode.Encode(resolvedURL, qrcode.High, 150)
165165
if err != nil {
@@ -499,15 +499,13 @@ func (s *Server) putHandler(w http.ResponseWriter, r *http.Request) {
499499
relativeURL, _ := url.Parse(path.Join(s.proxyPath, token, filename))
500500
deleteURL, _ := url.Parse(path.Join(s.proxyPath, token, filename, metadata.DeletionToken))
501501

502-
w.Header().Set("X-Url-Delete", resolveURL(r, deleteURL, true))
502+
w.Header().Set("X-Url-Delete", resolveURL(r, deleteURL))
503503

504-
fmt.Fprint(w, resolveURL(r, relativeURL, false))
504+
fmt.Fprint(w, resolveURL(r, relativeURL))
505505
}
506506

507-
func resolveURL(r *http.Request, u *url.URL, absolutePath bool) string {
508-
if absolutePath {
509-
r.URL.Path = ""
510-
}
507+
func resolveURL(r *http.Request, u *url.URL) string {
508+
r.URL.Path = ""
511509

512510
return getURL(r).ResolveReference(u).String()
513511
}

0 commit comments

Comments
 (0)