Merge pull request #600 from marccohen/master

fix handling of Null (None) Content-Type header for resumable uploads
boto · Feb 27, 2012 · 3a825d7 · 3a825d7
2 parents c0b5374 + 33fb4d2
commit 3a825d7
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/boto/gs/resumable_upload_handler.py b/boto/gs/resumable_upload_handler.py
@@ -505,6 +505,12 @@ def send_file(self, key, fp, headers, cb=None, num_cb=10):
 
         if not headers:
             headers = {}
+        # If Content-Type header is present and set to None, remove it.
+        # This is gsutil's way of asking boto to refrain from auto-generating
+        # that header.
+        CT = 'Content-Type'
+        if CT in headers and not headers[CT]:
+          del headers[CT]
 
         fp.seek(0, os.SEEK_END)
         file_length = fp.tell()