Skip to content

Commit

Permalink
Merge pull request #904 from ambrusadrianz/master
Browse files Browse the repository at this point in the history
Fixed S3 copyObject compatibility with the Java AWS SDK
  • Loading branch information
spulec committed Apr 16, 2017
2 parents a83a235 + 121a68b commit e9bf74d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions moto/s3/responses.py
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ def _key_response_put(self, request, body, bucket_name, query, key_name, headers
upload_id = query['uploadId'][0]
part_number = int(query['partNumber'][0])
if 'x-amz-copy-source' in request.headers:
src = request.headers.get("x-amz-copy-source")
src = request.headers.get("x-amz-copy-source").lstrip("/")
src_bucket, src_key = src.split("/", 1)
src_range = request.headers.get(
'x-amz-copy-source-range', '').split("bytes=")[-1]
Expand Down Expand Up @@ -541,7 +541,7 @@ def _key_response_put(self, request, body, bucket_name, query, key_name, headers
if 'x-amz-copy-source' in request.headers:
# Copy key
src_key_parsed = urlparse(request.headers.get("x-amz-copy-source"))
src_bucket, src_key = src_key_parsed.path.split("/", 1)
src_bucket, src_key = src_key_parsed.path.lstrip("/").split("/", 1)
src_version_id = parse_qs(src_key_parsed.query).get(
'versionId', [None])[0]
self.backend.copy_key(src_bucket, src_key, bucket_name, key_name,
Expand Down

0 comments on commit e9bf74d

Please sign in to comment.