summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-06-13 12:11:29 -0300
committerdrebs <drebs@leap.se>2013-06-13 12:11:29 -0300
commit0deaa2070a88404779ae9a8dab88ee11521c5032 (patch)
tree571c09145e1a9baf649bee6b1a0856a868580ccf /src/leap
parent92724a1bf110a6f97dbfaec4a7d68388eef19dc5 (diff)
parent7a737ff200c63e7d3a2dc5619b619e07b56fc6a2 (diff)
Merge remote-tracking branch 'remotes/chiiph/bug/modifiable_timeout' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/soledad/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/leap/soledad/__init__.py b/src/leap/soledad/__init__.py
index ea3f676b..21457caf 100644
--- a/src/leap/soledad/__init__.py
+++ b/src/leap/soledad/__init__.py
@@ -1073,6 +1073,9 @@ class Soledad(object):
# Monkey patching u1db to be able to provide a custom SSL cert
#-----------------------------------------------------------------------------
+# We need a more reasonable timeout (in seconds)
+SOLEDAD_TIMEOUT = 10
+
class VerifiedHTTPSConnection(httplib.HTTPSConnection):
"""HTTPSConnection verifying server side certificates."""
# derived from httplib.py
@@ -1080,7 +1083,7 @@ class VerifiedHTTPSConnection(httplib.HTTPSConnection):
def connect(self):
"Connect to a host on a given (SSL) port."
sock = socket.create_connection((self.host, self.port),
- self.timeout, self.source_address)
+ SOLEDAD_TIMEOUT, self.source_address)
if self._tunnel_host:
self.sock = sock
self._tunnel()