Attachment 595097 Details for Bug 836329 – Quick hack to try AF_INET and AF_INET6

[patch] Quick hack to try AF_INET and AF_INET6

koji-ipv6-hack.patch (text/plain), 1.05 KB, created by Alexey I. Froloff on 2012-06-28 17:42:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey I. Froloff

Created: 2012-06-28 17:42:48 UTC

Size: 1.05 KB

patch

obsolete

>--- /usr/lib/python2.7/site-packages/koji/ssl/SSLCommon.py.orig	2012-05-31 23:05:43.000000000 +0400
>+++ /usr/lib/python2.7/site-packages/koji/ssl/SSLCommon.py	2012-06-28 21:33:54.858775607 +0400
>@@ -100,12 +100,23 @@
>         self._timeout = timeout
> 
>     def connect(self):
>-        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
>-        con = SSL.Connection(self.ssl_ctx, sock)
>-        self.sock = SSLConnection.SSLConnection(con)
>-        if sys.version_info[:3] >= (2, 3, 0):
>-            self.sock.settimeout(self._timeout)
>-        self.sock.connect((self.host, self.port))
>+	_err = None
>+	for family in [socket.AF_INET, socket.AF_INET6]:
>+		try:
>+			_err = None
>+			sock = socket.socket(family, socket.SOCK_STREAM)
>+			con = SSL.Connection(self.ssl_ctx, sock)
>+			self.sock = SSLConnection.SSLConnection(con)
>+			if sys.version_info[:3] >= (2, 3, 0):
>+			    self.sock.settimeout(self._timeout)
>+			self.sock.connect((self.host, self.port))
>+		except Exception, e:
>+			_err = e
>+		else:
>+			break
>+
>+	if _err:
>+		raise _err
> 
> 
> class PlgHTTPS(httplib.HTTP):

Actions: View | Diff

Attachments on bug 836329: 595097