MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-09 21:49:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Return complete Location URL in CompleteMultipartUpload (#5692)

Browse Source 
Remove getLocation function.
Fixes #5687
This commit is contained in:
kannappanr
2018-03-23 13:46:57 -07:00
committed by GitHub
parent 1c91c7b54d
commit 7c747a9643
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/api-response.go
View File

@@ -268,11 +268,6 @@ type PostResponse struct {
Location string
}
// getLocation get URL location.
func getLocation(r *http.Request) string {
return path.Clean(r.URL.Path) // Clean any trailing slashes.
}
// returns "https" if the tls boolean is true, "http" otherwise.
func getURLScheme(tls bool) string {
if tls {
@@ -283,6 +278,10 @@ func getURLScheme(tls bool) string {
// getObjectLocation gets the fully qualified URL of an object.
func getObjectLocation(r *http.Request, domain, bucket, object string) string {
// unit tests do not have host set.
if r.Host == "" {
return path.Clean(r.URL.Path)
}
proto := handlers.GetSourceScheme(r)
if proto == "" {
proto = getURLScheme(globalIsSSL)