projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16833: Merge branch 'master' into 16833-replace-epydoc
[arvados.git]
/
services
/
keep-web
/
s3.go
diff --git
a/services/keep-web/s3.go
b/services/keep-web/s3.go
index 4e8028ae6e8de3c429679c7ff25fc87ee58f3cf2..52cfede46642120dce520868d2d38758fb97cc12 100644
(file)
--- a/
services/keep-web/s3.go
+++ b/
services/keep-web/s3.go
@@
-358,6
+358,11
@@
func (h *handler) s3list(w http.ResponseWriter, r *http.Request, fs arvados.Cust
// CommonPrefixes is nil, which confuses some clients.
// Fix by using this nested struct instead.
CommonPrefixes []commonPrefix
// CommonPrefixes is nil, which confuses some clients.
// Fix by using this nested struct instead.
CommonPrefixes []commonPrefix
+ // Similarly, we need omitempty here, because an empty
+ // tag confuses some clients (e.g.,
+ // github.com/aws/aws-sdk-net never terminates its
+ // paging loop).
+ NextMarker string `xml:"NextMarker,omitempty"`
}
resp := listResp{
ListResp: s3.ListResp{
}
resp := listResp{
ListResp: s3.ListResp{