@@ -417,7 +417,7 @@ class S3(object):

             content_type = content_type + "; charset=" + self.config.encoding.upper()

         headers["content-type"] = content_type

-        if content_encoding is not None:

+        if content_encoding is not None and self.config.add_content_encoding:

             headers["content-encoding"] = content_encoding

         ## Other Amazon S3 attributes

@@ -1868,6 +1868,7 @@ def main():

     optparser.add_option(      "--add-header", dest="add_header", action="append", metavar="NAME:VALUE", help="Add a given HTTP header to the upload request. Can be used multiple times. For instance set 'Expires' or 'Cache-Control' headers (or both) using this options if you like.")

     optparser.add_option(      "--encoding", dest="encoding", metavar="ENCODING", help="Override autodetected terminal and filesystem encoding (character set). Autodetected: %s" % preferred_encoding)

+    optparser.add_option(      "--disable-content-encoding", dest="add_content_encoding", action="store_false", help="Don't include a Content-encoding header to the the uploaded objects")

     optparser.add_option(      "--add-encoding-exts", dest="add_encoding_exts", metavar="EXTENSIONs", help="Add encoding to these comma delimited extensions i.e. (css,js,html) when uploading to S3 )")

     optparser.add_option(      "--verbatim", dest="urlencoding_mode", action="store_const", const="verbatim", help="Use the S3 name as given on the command line. No pre-processing, encoding, etc. Use with caution!")

@@ -262,6 +262,9 @@ Add a given HTTP header to the upload request. Can be used multiple times. For i

 \fB\-\-encoding\fR=ENCODING

 Override autodetected terminal and filesystem encoding (character set). Autodetected: UTF-8

 .TP

+\fB\-\-disable\-content\-encoding\fR

+Don't include a Content-encoding header to the the uploaded objects. Default: False

+.TP

 \fB\-\-add\-encoding\-exts\fR=EXTENSIONs

 Add encoding to these comma delimited extensions i.e. (css,js,html) when uploading to S3 )

 .TP