@@ -1,5 +1,6 @@

 2010-12-24  Michal Ludvig  <mludvig@logix.net.nz>

+	* s3cmd: Set 10s socket timeout for read()/write().

 	* s3cmd: Added --(no-)check-md5 for [sync].

 	* run-tests.py, testsuite.tar.gz: Added testsuite for

 	  the above.

@@ -1,6 +1,7 @@

 s3cmd 1.0.0

 ===========

 * [sync] now supports --no-check-md5

+* Network connections now have 10s timeout

 s3cmd 1.0.0-rc2 -  2010-12-09

 ===============

@@ -74,7 +74,8 @@ class Config(object):

 	urlencoding_mode = "normal"

 	log_target_prefix = ""

 	reduced_redundancy = False

-        follow_symlinks=False

+	follow_symlinks = False

+	socket_timeout = 10

 	## Creating a singleton

 	def __new__(self, configfile = None):

@@ -22,6 +22,7 @@ import codecs

 import locale

 import subprocess

 import htmlentitydefs

+import socket

 from copy import copy

 from optparse import OptionParser, Option, OptionValueError, IndentedHelpFormatter

@@ -1906,9 +1907,12 @@ def main():

 	cfg.include.extend(patterns_list)

 	cfg.debug_include.update(patterns_textual)

-        ## Process --follow-symlinks

+	## Process --follow-symlinks

 	cfg.update_option("follow_symlinks", options.follow_symlinks)

+	## Set socket read()/write() timeout

+	socket.setdefaulttimeout(cfg.socket_timeout)

+

 	if cfg.encrypt and cfg.gpg_passphrase == "":

 		error(u"Encryption requested but no passphrase set in config file.")

 		error(u"Please re-run 's3cmd --configure' and supply it.")