@@ -619,18 +619,39 @@ class S3(object):

         debug("Received response '%s'" % (response))

         return response

+    @staticmethod

+    def _sanitize_headers(headers):

+        to_remove = ('content-length',

+                     'x-amz-id-2',

+                     'accept-ranges',

+                     'x-amz-meta-s3cmd-attrs',

+                     'server',

+                     'last-modified',

+                     'etag',

+                     'x-amz-request-id',

+                     'content-type')

+        for h in to_remove:

+            if h in headers: del headers[h]

+        return headers

+

     def object_copy(self, src_uri, dst_uri, extra_headers = None):

         if src_uri.type != "s3":

             raise ValueError("Expected URI type 's3', got '%s'" % src_uri.type)

         if dst_uri.type != "s3":

             raise ValueError("Expected URI type 's3', got '%s'" % dst_uri.type)

-        headers = SortedDict(ignore_case = True)

+

+        response = self.object_info(src_uri)

+        headers = response['headers']

+        headers = self._sanitize_headers(headers)

+

         headers['x-amz-copy-source'] = "/%s/%s" % (src_uri.bucket(), self.urlencode_string(src_uri.object()))

         headers['x-amz-metadata-directive'] = "COPY"

         if self.config.acl_public:

             headers["x-amz-acl"] = "public-read"

         if self.config.reduced_redundancy:

             headers["x-amz-storage-class"] = "REDUCED_REDUNDANCY"

+        else:

+            headers["x-amz-storage-class"] = "STANDARD"

         ## Set server side encryption

         if self.config.server_side_encryption:

@@ -642,19 +663,22 @@ class S3(object):

         request = self.create_request("OBJECT_PUT", uri = dst_uri, headers = headers)

         response = self.send_request(request)

         return response

-

-    def object_replace(self, src_uri, dst_uri, extra_headers = None):

+        

+    def object_modify(self, src_uri, dst_uri, extra_headers = None):

         if src_uri.type != "s3":

             raise ValueError("Expected URI type 's3', got '%s'" % src_uri.type)

         if dst_uri.type != "s3":

             raise ValueError("Expected URI type 's3', got '%s'" % dst_uri.type)

-        headers = SortedDict(ignore_case = True)

+

+        info_response = self.object_info(src_uri)

+        headers = info_response['headers']

+        headers = self._sanitize_headers(headers)

+        acl = self.get_acl(src_uri)

+

         headers['x-amz-copy-source'] = "/%s/%s" % (src_uri.bucket(), self.urlencode_string(src_uri.object()))

         headers['x-amz-metadata-directive'] = "REPLACE"

-        if self.config.acl_public:

-            headers["x-amz-acl"] = "public-read"

-        if self.config.reduced_redundancy:

-            headers["x-amz-storage-class"] = "REDUCED_REDUNDANCY"

+

+        # cannot change between standard and reduced redundancy with a REPLACE.

         ## Set server side encryption

         if self.config.server_side_encryption:

@@ -665,8 +689,11 @@ class S3(object):

         headers["content-type"] = self.content_type()

-        request = self.create_request("OBJECT_PUT", uri = dst_uri, headers = headers)

+        request = self.create_request("OBJECT_PUT", uri = src_uri, headers = headers)

         response = self.send_request(request)

+

+        acl_response = self.set_acl(src_uri, acl)

+

         return response

     def object_move(self, src_uri, dst_uri, extra_headers = None):

@@ -753,7 +753,7 @@ def cmd_cp(args):

 def cmd_modify(args):

     s3 = S3(Config())

-    return subcmd_cp_mv(args, s3.object_replace, "modify", u"File %(src)s modified")

+    return subcmd_cp_mv(args, s3.object_modify, "modify", u"File %(src)s modified")

 def cmd_mv(args):

     s3 = S3(Config())

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

     optparser.add_option(      "--files-from", dest="files_from", action="append", metavar="FILE", help="Read list of source-file names from FILE. Use - to read from stdin.")

     optparser.add_option(      "--bucket-location", dest="bucket_location", help="Datacentre to create bucket in. As of now the datacenters are: US (default), EU, ap-northeast-1, ap-southeast-1, sa-east-1, us-west-1 and us-west-2")

     optparser.add_option(      "--reduced-redundancy", "--rr", dest="reduced_redundancy", action="store_true", help="Store object with 'Reduced redundancy'. Lower per-GB price. [put, cp, mv]")

+    optparser.add_option(      "--no-reduced-redundancy", "--no-rr", dest="reduced_redundancy", action="store_false", help="Store object without 'Reduced redundancy'. Higher per-GB price. [put, cp, mv]")

     optparser.add_option(      "--access-logging-target-prefix", dest="log_target_prefix", help="Target prefix for access logs (S3 URI) (for [cfmodify] and [accesslog] commands)")

     optparser.add_option(      "--no-access-logging", dest="log_target_prefix", action="store_false", help="Disable access logging (for [cfmodify] and [accesslog] commands)")