[boto] r1337 committed - Allow additional HTTP headers. Fixes issue 262.

[codesite...@google.com]

Revision: 1337
Author: Mitch.Garnaat
Date: Sun Oct 25 20:25:27 2009
Log: Allow additional HTTP headers. Fixes issue 262.
http://code.google.com/p/boto/source/detail?r=1337

Modified:
/trunk/boto/utils.py

=======================================
--- /trunk/boto/utils.py Sun Oct 4 16:23:43 2009
+++ /trunk/boto/utils.py Sun Oct 25 20:25:27 2009
@@ -117,7 +117,9 @@
def merge_meta(headers, metadata):
final_headers = headers.copy()
for k in metadata.keys():
- if k.lower() in ['content-md5', 'content-type', 'date']:
+ if k.lower() in ['cache-control', 'content-md5', 'content-type',
+ 'content-encoding', 'content-disposition',
+ 'date', 'expires']:
final_headers[k] = metadata[k]
else:
final_headers[METADATA_PREFIX + k] = metadata[k]