[ARVADOS] updated: 2.1.0-145-g0c5e55d63
Git user
git at public.arvados.org
Wed Nov 25 17:15:28 UTC 2020
Summary of changes:
services/keep-web/s3.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
via 0c5e55d63d1f8b472845bd7160057ddea07044d6 (commit)
from aa44987f259d1a01fe98f53d96ed32f1dc134e85 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 0c5e55d63d1f8b472845bd7160057ddea07044d6
Author: Tom Clegg <tom at tomclegg.ca>
Date: Wed Nov 25 12:14:34 2020 -0500
17009: Fix bucket-level ops using virtual host-style requests.
refs #17009
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>
diff --git a/services/keep-web/s3.go b/services/keep-web/s3.go
index 4ee69f277..373fd9a25 100644
--- a/services/keep-web/s3.go
+++ b/services/keep-web/s3.go
@@ -225,7 +225,7 @@ func (h *handler) serveS3(w http.ResponseWriter, r *http.Request) bool {
fspath := "/by_id"
if id := parseCollectionIDFromDNSName(r.Host); id != "" {
fspath += "/" + id
- objectNameGiven = true
+ objectNameGiven = strings.Count(strings.TrimSuffix(r.URL.Path, "/"), "/") > 0
} else {
objectNameGiven = strings.Count(strings.TrimSuffix(r.URL.Path, "/"), "/") > 1
}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list