Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim
Commits: 72b8c0ab by Philipp Hörist at 2019-04-06T07:34:31Z Windows: Fix version comparison
Fixes #9643
- - - - - 5f562fb0 by Philipp Hörist at 2019-04-06T07:34:50Z Iterate safely over dict
Fixes #9633
- - - - -
1 changed file:
- gajim/common/socks5.py
Changes:
===================================== gajim/common/socks5.py ===================================== @@ -23,7 +23,7 @@ import struct import hashlib import os import time -import platform +import sys import logging from errno import EWOULDBLOCK from errno import ENOBUFS @@ -296,7 +296,7 @@ class SocksQueue: def activate_proxy(self, idx): if not self.isHashInSockObjs(self.senders, idx): return - for key in self.senders: + for key in list(self.senders): if idx in key: sender = self.senders[key] if sender.file_props.type_ != 's': @@ -1436,7 +1436,7 @@ class Socks5Listener(IdleObject): # Under windows Vista, we need that to listen on ipv6 AND ipv4 # Doesn't work under windows XP if os.name == 'nt': - if int(platform.win32_ver()[0]) >= 6: # Win Vista + + if sys.getwindowsversion().major >= 6: # Win Vista + # 47 is socket.IPPROTO_IPV6 # 27 is socket.IPV6_V6ONLY under windows, but not defined ... self._serv.setsockopt(41, 27, 0)
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/80f37bb3fa963770ed547fd7574c6dbdb0...