socket timeout on ssl bug

2012-06-27 17:45:09 -05:00
parent 1f7cdfc8eb
commit 0f8a29daeb
2 changed files with 3 additions and 1 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-Version 2.00.0 (2012-06-27 16:53:32) dev
+Version 2.00.0 (2012-06-27 17:45:06) dev
--- a/gluon/rocket.py
+++ b/gluon/rocket.py
@@ -1374,6 +1374,8 @@ class Worker(Thread):
                    d = d.decode('ISO-8859-1')
        except socket.timeout:
            raise SocketTimeout("Socket timed out before request.")
+        except TypeError:
+            raise SocketTimeout("Socket timed out before request.")

        d = d.strip()