Permalink
Browse files

Merge branch 'master' of github.com:celery/kombu

  • Loading branch information...
2 parents 7b5551f + 9d0668e commit 96b3b0b436aa87d9e14720694f55ea235a5873c3 @ask ask committed Oct 12, 2012
Showing with 3 additions and 0 deletions.
  1. +3 −0 kombu/transport/amqplib.py
@@ -195,6 +195,9 @@ def read_timeout(self, timeout=None):
# http://bugs.python.org/issue10272
if 'timed out' in str(exc):
raise socket.timeout()
+ # Non-blocking SSL sockets can throw SSLError
+ if 'The operation did not complete' in str(exc):
+ raise socket.timeout()
raise
finally:
if prev != timeout:

0 comments on commit 96b3b0b

Please sign in to comment.