libretic/transfer.sh
6
0
Fork 0
mirror of https://github.com/dutchcoders/transfer.sh.git synced 2024-12-26 04:10:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #216 from dutchcoders/ISSUE-215

Browse source 
ISSUE-215
This commit is contained in:
Andrea Spacca 2019-04-27 16:17:20 +02:00 committed by GitHub
commit cd602b9256
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
server/handlers.go
View file

@ -325,6 +325,7 @@ func (s *Server) postHandler(w http.ResponseWriter, r *http.Request) {
} }
filename = url.QueryEscape(filename)
relativeURL, _ := url.Parse(path.Join(token, filename)) relativeURL, _ := url.Parse(path.Join(token, filename))
fmt.Fprintln(w, getURL(r).ResolveReference(relativeURL).String()) fmt.Fprintln(w, getURL(r).ResolveReference(relativeURL).String())
@ -476,6 +477,7 @@ func (s *Server) putHandler(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "text/plain") w.Header().Set("Content-Type", "text/plain")
filename = url.QueryEscape(filename)
relativeURL, _ := url.Parse(path.Join(token, filename)) relativeURL, _ := url.Parse(path.Join(token, filename))
deleteUrl, _ := url.Parse(path.Join(token, filename, metadata.DeletionToken)) deleteUrl, _ := url.Parse(path.Join(token, filename, metadata.DeletionToken))
@ -485,16 +487,6 @@ func (s *Server) putHandler(w http.ResponseWriter, r *http.Request) {
} }
func resolveUrl(r *http.Request, u *url.URL, absolutePath bool) string { func resolveUrl(r *http.Request, u *url.URL, absolutePath bool) string {
if u.RawQuery != "" {
u.Path = fmt.Sprintf("%s?%s", u.Path, url.QueryEscape(u.RawQuery))
u.RawQuery = ""
}
if u.Fragment != "" {
u.Path = fmt.Sprintf("%s#%s", u.Path, u.Fragment)
u.Fragment = ""
}
if absolutePath { if absolutePath {
r.URL.Path = "" r.URL.Path = ""
} }