@@ -1,3 +1,9 @@

+2008-04-28  Michal Ludvig  <michal@logix.cz>

+

+	* S3/S3.py: send_file() now computes MD5 sum of the file

+	  being uploaded, compares with ETag returned by Amazon

+	  and retries upload if they don't match.

+

 2008-03-05  Michal Ludvig  <michal@logix.cz>

 	* s3cmd, S3/S3.py, S3/Utils.py: Throttle upload speed and retry 

@@ -372,10 +372,12 @@ class S3(object):

 		conn.endheaders()

 		file.seek(0)

 		timestamp_start = time.time()

+		md5_hash = md5.new()

 		size_left = size_total = headers.get("content-length")

 		while (size_left > 0):

 			debug("SendFile: Reading up to %d bytes from '%s'" % (self.config.send_chunk, file.name))

 			data = file.read(self.config.send_chunk)

+			md5_hash.update(data)

 			debug("SendFile: Sending %d bytes to the server" % len(data))

 			try:

 				conn.send(data)

@@ -399,6 +401,7 @@ class S3(object):

 				(size_total - size_left) * 100 / size_total,

 				size_total))

 		timestamp_end = time.time()

+		md5_computed = md5_hash.hexdigest()

 		response = {}

 		http_response = conn.getresponse()

 		response["status"] = http_response.status

@@ -418,6 +421,16 @@ class S3(object):

 			info("Redirected to: %s" % (redir_hostname))

 			return self.send_file(request, file)

+		debug("MD5 sums: computed=%s, received=%s" % (md5_computed, response["headers"]["etag"]))

+		if response["headers"]["etag"].strip('"\'') != md5_hash.hexdigest():

+			warning("MD5 Sums don't match!")

+			if retries:

+				info("Retrying upload.")

+				return self.send_file(request, file, throttle, retries - 1)

+			else:

+				debug("Too many failures. Giving up on '%s'" % (file.name))

+				raise S3UploadError

+

 		if response["status"] < 200 or response["status"] > 299:

 			raise S3Error(response)

 		return response