x/swift3
Code Issues Proposed changes

Merge "Fix response of Upload Part Copy requests"

Browse Source
This commit is contained in:
Jenkins
2015-01-16 00:34:51 +00:00
committed by Gerrit Code Review
parent af345a2637 8413ace10b
commit a0834c83a4
4 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
swift3/controllers/multi_upload.py
View File

@@ -113,7 +113,8 @@ class PartController(Controller):
req.check_copy_source(self.app)
resp = req.get_response(self.app)
# TODO: set xml body for copy requests.
if 'X-Amz-Copy-Source' in req.headers:
resp.append_copy_resp_body()
resp.status = 200
return resp

9
swift3/controllers/obj.py
View File

@@ -18,7 +18,6 @@ from swift.common.swob import Range, content_range_header_value
from swift3.controllers.base import Controller
from swift3.response import S3NotImplemented, InvalidRange, HTTPPartialContent
from swift3.etree import Element, SubElement, tostring
class ObjectController(Controller):
@@ -97,13 +96,7 @@ class ObjectController(Controller):
resp = req.get_response(self.app)
if 'X-Amz-Copy-Source' in req.headers:
elem = Element('CopyObjectResult')
SubElement(elem, 'LastModified').text = \
resp.last_modified.isoformat()[:-6] + '.000Z'
SubElement(elem, 'ETag').text = '"%s"' % resp.etag
resp.body = tostring(elem)
resp.headers['Content-Type'] = 'application/xml'
resp.etag = None
resp.append_copy_resp_body()
resp.status = HTTP_OK
return resp