@@ -157,9 +157,9 @@ func (s *Server) previewHandler(w http.ResponseWriter, r *http.Request) {
157
157
}
158
158
159
159
relativeURL , _ := url .Parse (path .Join (s .proxyPath , token , filename ))
160
- resolvedURL := resolveURL (r , relativeURL , true )
160
+ resolvedURL := resolveURL (r , relativeURL )
161
161
relativeURLGet , _ := url .Parse (path .Join (s .proxyPath , getPathPart , token , filename ))
162
- resolvedURLGet := resolveURL (r , relativeURLGet , true )
162
+ resolvedURLGet := resolveURL (r , relativeURLGet )
163
163
var png []byte
164
164
png , err = qrcode .Encode (resolvedURL , qrcode .High , 150 )
165
165
if err != nil {
@@ -499,15 +499,13 @@ func (s *Server) putHandler(w http.ResponseWriter, r *http.Request) {
499
499
relativeURL , _ := url .Parse (path .Join (s .proxyPath , token , filename ))
500
500
deleteURL , _ := url .Parse (path .Join (s .proxyPath , token , filename , metadata .DeletionToken ))
501
501
502
- w .Header ().Set ("X-Url-Delete" , resolveURL (r , deleteURL , true ))
502
+ w .Header ().Set ("X-Url-Delete" , resolveURL (r , deleteURL ))
503
503
504
- fmt .Fprint (w , resolveURL (r , relativeURL , false ))
504
+ fmt .Fprint (w , resolveURL (r , relativeURL ))
505
505
}
506
506
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 = ""
511
509
512
510
return getURL (r ).ResolveReference (u ).String ()
513
511
}
0 commit comments