Skip to content
Snippets Groups Projects
Commit d05aa39e authored by Eric S. Raymond's avatar Eric S. Raymond
Browse files

Version bump for release 2.15

parent d293d722
No related branches found
No related tags found
No related merge requests found
irker history irker history
2.15: 2016-01-12
Emergency backout of getaddrinfo, it randomly hanges.
2.14: 2016-01-12 2.14: 2016-01-12
Lookup with getaddrinfo allows use with IPv6. Lookup with getaddrinfo allows use with IPv6.
Documentation improvements.
2.13: 2015-06-14 2.13: 2015-06-14
SSL validation fix. SSL validation fix.
......
...@@ -42,7 +42,7 @@ CONNECTION_MAX = 200 # To avoid hitting a thread limit ...@@ -42,7 +42,7 @@ CONNECTION_MAX = 200 # To avoid hitting a thread limit
# No user-serviceable parts below this line # No user-serviceable parts below this line
version = "2.14" version = "2.15"
import argparse import argparse
import logging import logging
...@@ -286,27 +286,14 @@ class IRCServerConnection(): ...@@ -286,27 +286,14 @@ class IRCServerConnection():
self.real_server_name = "" self.real_server_name = ""
self.target = target self.target = target
self.nickname = nickname self.nickname = nickname
try:
err = None self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
for res in socket.getaddrinfo(target.servername, target.port, 0, socket.SOCK_STREAM): if target.ssl:
af, socktype, proto, canonname, sa = res self.socket = self._wrap_socket(
self.socket = None socket=self.socket, target=target, **kwargs)
try: self.socket.bind(('', 0))
self.socket = socket.socket(af, socktype, proto) self.socket.connect((target.servername, target.port))
if target.ssl: except socket.error as err:
self.socket = self._wrap_socket(
socket=self.socket, target=target, **kwargs)
self.socket.bind(('', 0))
self.socket.connect(sa)
except socket.error as _:
err = _
if self.socket is not None:
self.socket.close()
if self.socket is None:
err = socket.error("getaddrinfo returns an empty list")
if err is not None:
raise IRCServerConnectionError("Couldn't connect to socket: %s" % err) raise IRCServerConnectionError("Couldn't connect to socket: %s" % err)
if target.ssl: if target.ssl:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment