Daniel Brötzmann pushed to branch master at gajim / gajim

Commits:

1 changed file:

Changes:

  • gajim/common/socks5.py
    ... ... @@ -683,16 +683,18 @@ def write_next(self):
    683 683
                 lenn = 0
    
    684 684
                 try:
    
    685 685
                     lenn = self._send(buff)
    
    686
    -            except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError,
    
    687
    -            OpenSSL.SSL.WantX509LookupError) as e:
    
    688
    -                log.info('SSL rehandshake request: %s', repr(e))
    
    689
    -                raise e
    
    686
    +            except (OpenSSL.SSL.WantReadError,
    
    687
    +                    OpenSSL.SSL.WantWriteError,
    
    688
    +                    OpenSSL.SSL.WantX509LookupError) as err:
    
    689
    +                log.info('SSL rehandshake request: %s', repr(err))
    
    690
    +                raise err
    
    690 691
                 except OpenSSL.SSL.SysCallError:
    
    691 692
                     return self._on_send_exception()
    
    692 693
                 except socket.error as err:
    
    693
    -                if e.errno not in (EINTR, ENOBUFS, EWOULDBLOCK):
    
    694
    +                if err.errno not in (EINTR, ENOBUFS, EWOULDBLOCK):
    
    694 695
                         return self._on_send_exception()
    
    695 696
                 except Exception as err:
    
    697
    +                log.error(err)
    
    696 698
                     return self._on_send_exception()
    
    697 699
     
    
    698 700
                 self.size += lenn