Daniel Brötzmann pushed to branch master at gajim / gajim
Commits: dcd84306 by wurstsalat at 2022-05-23T01:38:20+02:00 fix: Socks5: Catch exception error correctly
- - - - -
1 changed file:
- gajim/common/socks5.py
Changes:
===================================== gajim/common/socks5.py ===================================== @@ -683,16 +683,18 @@ def write_next(self): lenn = 0 try: lenn = self._send(buff) - except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, - OpenSSL.SSL.WantX509LookupError) as e: - log.info('SSL rehandshake request: %s', repr(e)) - raise e + except (OpenSSL.SSL.WantReadError, + OpenSSL.SSL.WantWriteError, + OpenSSL.SSL.WantX509LookupError) as err: + log.info('SSL rehandshake request: %s', repr(err)) + raise err except OpenSSL.SSL.SysCallError: return self._on_send_exception() except socket.error as err: - if e.errno not in (EINTR, ENOBUFS, EWOULDBLOCK): + if err.errno not in (EINTR, ENOBUFS, EWOULDBLOCK): return self._on_send_exception() except Exception as err: + log.error(err) return self._on_send_exception()
self.size += lenn
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dcd843065919c9f9cc44c577b7743c187...