From e017f8963e4e77130570534a9853c97564b3a41d Mon Sep 17 00:00:00 2001 From: MORITA Kazutaka Date: Tue, 12 Aug 2014 01:39:25 +0900 Subject: [PATCH] bucket: return delimiter only when it is specified in query This is AWS S3's behavior. Change-Id: Iede394f32c27ac1d8056aa8d64fc3c8626e84226 --- swift3/controllers/bucket.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/swift3/controllers/bucket.py b/swift3/controllers/bucket.py index bfe08034..ffef75ad 100644 --- a/swift3/controllers/bucket.py +++ b/swift3/controllers/bucket.py @@ -72,7 +72,10 @@ class BucketController(Controller): SubElement(elem, 'Prefix').text = req.params.get('prefix') SubElement(elem, 'Marker').text = req.params.get('marker') SubElement(elem, 'MaxKeys').text = str(max_keys) - SubElement(elem, 'Delimiter').text = req.params.get('delimiter') + + if 'delimiter' in req.params: + SubElement(elem, 'Delimiter').text = req.params['delimiter'] + if max_keys > 0 and len(objects) == max_keys + 1: is_truncated = 'true' else: