Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix S3 sync issue with keys containing urlencode values #755

Merged
merged 1 commit into from
Apr 18, 2014

Conversation

jamesls
Copy link
Member

@jamesls jamesls commented Apr 17, 2014

Fixes #749. This was a regression from the fix for #675
where we use the encoding_type of "url" to workaround
the stdlib xmlparser not handling new lines.

The problem is that pagination in s3 uses the last key name as
the marker, and because the keys are returned urlencoded, we
need to urldecode the keys so botocore sends the correct next
marker. In the case where urldecoded(key) != key we will incorrectly
sync new files.

Also added an integ test for syncing with '+' chars.

cc @danielgtaylor

Fixes aws#749.  This was a regression from the fix for aws#675
where we use the encoding_type of "url" to workaround
the stdlib xmlparser not handling new lines.

The problem is that pagination in s3 uses the last key name as
the marker, and because the keys are returned urlencoded, we
need to urldecode the keys so botocore sends the correct next
marker.  In the case where urldecoded(key) != key we will incorrectly
sync new files.

Also added an integ test for syncing with '+' chars.
@danielgtaylor
Copy link
Contributor

LGTM 🚢-it!

@jamesls jamesls merged commit 1236dd2 into aws:develop Apr 18, 2014
@jamesls jamesls deleted the s3-sync-whitespace branch June 23, 2014 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

s3 sync from local to s3 bucket re-uploads files with version 1.3.6
2 participants