Skip to content
Browse files

Merge remote-tracking branch 'brendano/master' into brendano-merge

  • Loading branch information...
2 parents 9b11618 + 1600d5a commit 0451a17b8c4912b7faad2ffb4d83080545f26823 @mdomsch committed with
Showing with 3 additions and 0 deletions.
  1. +3 −0 S3/S3.py
View
3 S3/S3.py
@@ -60,6 +60,9 @@ class S3Request(object):
def __init__(self, s3, method_string, resource, headers, params = {}):
self.s3 = s3
self.headers = SortedDict(headers or {}, ignore_case = True)
+ # Add in any extra headers from s3 config object
+ if self.s3.config.extra_headers:
+ self.headers.update(self.s3.config.extra_headers)
self.resource = resource
self.method_string = method_string
self.params = params

0 comments on commit 0451a17

Please sign in to comment.
Something went wrong with that request. Please try again.