Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:boto/boto into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
garnaat committed Dec 3, 2012
2 parents 716ad08 + 37c2864 commit 3187f22
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions boto/s3/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,6 @@ def build_post_form_args(self, bucket_name, key, expires_in=6000,
fields.append({"name": "success_action_redirect", "value": success_action_redirect})
if max_content_length:
conditions.append('["content-length-range", 0, %i]' % max_content_length)
fields.append({"name": 'content-length-range',
"value": "0,%i" % max_content_length})

if self.provider.security_token:
fields.append({'name': 'x-amz-security-token',
Expand Down

0 comments on commit 3187f22

Please sign in to comment.