@@ -1,3 +1,10 @@

+2008-02-11  Michal Ludvig  <michal@logix.cz>

+

+	* S3/S3.py, S3/Config.py: Support for MIME types. Both 

+	default and guessing. Fixes bug #1872192 (Thanks Martin Herr)

+

+2007-11-13  Michal Ludvig  <michal@logix.cz>

+

 	* Released version 0.9.5

 	  ----------------------

@@ -44,6 +44,8 @@ class Config(object):

 	gpg_decrypt = "%(gpg_command)s -d --verbose --no-use-agent --batch --yes --passphrase-fd %(passphrase_fd)s -o %(output_file)s %(input_file)s"

 	use_https = False

 	bucket_location = "US"

+	default_mime_type = "binary/octet-stream"

+	guess_mime_type = False

 	## Creating a singleton

 	def __new__(self, configfile = None):

@@ -11,6 +11,7 @@ import sha

 import hmac

 import httplib

 import logging

+import mimetypes

 from logging import debug, info, warning, error

 from stat import ST_SIZE

@@ -174,6 +175,13 @@ class S3(object):

 		if extra_headers:

 			headers.update(extra_headers)

 		headers["content-length"] = size

+		content_type = None

+		if self.config.guess_mime_type:

+			content_type = mimetypes.guess_type(filename)[0]

+		if not content_type:

+			content_type = self.config.default_mime_type

+		debug("Content-Type set to '%s'" % content_type)

+		headers["content-type"] = content_type

 		if self.config.acl_public:

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

 		request = self.create_request("OBJECT_PUT", bucket = bucket, object = object, headers = headers)