diff options
| author | Lance Stout <lancestout@gmail.com> | 2013-06-20 09:19:53 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2013-06-20 09:19:53 -0700 |
| commit | f4c69d4045156bdc2ae5dfad86a4247a3833a3e0 (patch) | |
| tree | 1e3d06b33822a46f1db44a9107ab3e8df08da8c2 /sleekxmpp/xmlstream/xmlstream.py | |
| parent | baf9aaf26c80c87e770cdf35b1fa4fe231663246 (diff) | |
| parent | 1776e2edccf5f26d1d869791e19442ea35876bb1 (diff) | |
| download | slixmpp-f4c69d4045156bdc2ae5dfad86a4247a3833a3e0.tar.gz slixmpp-f4c69d4045156bdc2ae5dfad86a4247a3833a3e0.tar.bz2 slixmpp-f4c69d4045156bdc2ae5dfad86a4247a3833a3e0.tar.xz slixmpp-f4c69d4045156bdc2ae5dfad86a4247a3833a3e0.zip | |
Merge pull request #243 from anton-ryzhov/skip_eintr
Skip EINTR errors on raw sockets
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
| -rw-r--r-- | sleekxmpp/xmlstream/xmlstream.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index 478bd9c0..6de19482 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -1294,6 +1294,9 @@ class XMLStream(object): try: sent += self.socket.send(data[sent:]) count += 1 + except Socket.error as serr: + if serr.errno != errno.EINTR: + raise except ssl.SSLError as serr: if tries >= self.ssl_retry_max: log.debug('SSL error: max retries reached') @@ -1715,6 +1718,9 @@ class XMLStream(object): try: sent += self.socket.send(enc_data[sent:]) count += 1 + except Socket.error as serr: + if serr.errno != errno.EINTR: + raise except ssl.SSLError as serr: if tries >= self.ssl_retry_max: log.debug('SSL error: max retries reached') |