Index: samesite.py
==================================================================
--- samesite.py
+++ samesite.py
@@ -184,11 +184,10 @@
 				info += '\nFull file found.'
 				file_stat = os.stat(file_name)
 			elif '_parts' in index[my_path] and os.access(temp_name, os.R_OK):
 				info += '\nPartial file found.'
 				file_stat = os.stat(temp_name)
-				recheck = True
 			else:
 				info += '\nFile not found or inaccessible.'
 				record['_parts'] = None
 				reload = True
 
@@ -247,19 +246,18 @@
 						my_headers['range'] = 'bytes=' + ','.join(ranges)
 
 				my_headers['Accept-Encoding'] = 'gzip'
 				request = urllib2.Request(request, headers = my_headers)
 
-				source = urllib2.urlopen(request)
+				source = urllib2.urlopen(request, timeout = 60)
 				new_record = {}
 				new_record['_parts'] = record['_parts']
 				headers = source.info()
 
 				if 'content-encoding' in headers and headers['content-encoding'] == 'gzip':
-					import gzip, StringIO
-					buf = StringIO.StringIO(source.read())
-					source = gzip.GzipFile(fileobj=buf)
+					import gzip
+					source = gzip.GzipFile(fileobj=source)
 
 				# stripping unneeded headers (XXX make this inplace?)
 				for header in headers:
 					if header in desc_fields:
 						#if header == 'Pragma' and headers[header] != 'no-cache':