diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2013-02-28 16:14:30 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2013-02-28 16:14:30 +0000 |
| commit | 9c73ef7a5ac10acd6a50d5d52bd721fc2faa5919 (patch) | |
| tree | 2a890e1df09e5b896a9b4168a7b22648f559a1f2 /extras/qmf/src/py | |
| parent | 172d9b2a16cfb817bbe632d050acba7e31401cd2 (diff) | |
| download | qpid-python-asyncstore.tar.gz | |
Update from trunk r1375509 through r1450773asyncstore
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1451244 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'extras/qmf/src/py')
| -rw-r--r-- | extras/qmf/src/py/qmf/console.py | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/extras/qmf/src/py/qmf/console.py b/extras/qmf/src/py/qmf/console.py index af5d1da5ca..0a30176ed5 100644 --- a/extras/qmf/src/py/qmf/console.py +++ b/extras/qmf/src/py/qmf/console.py @@ -25,6 +25,7 @@ import qpid import struct import socket import re +import sys from qpid.datatypes import UUID from qpid.datatypes import timestamp from qpid.datatypes import datetime @@ -2423,11 +2424,21 @@ class Broker(Thread): oldTimeout = sock.gettimeout() sock.settimeout(self.connTimeout) connSock = None + force_blocking = False if self.ssl: + # Bug (QPID-4337): the "old" implementation of python SSL + # fails if the socket is set to non-blocking (which settimeout() + # may change). + if sys.version_info[:2] < (2, 6): # 2.6+ uses openssl - it's ok + force_blocking = True + sock.setblocking(1) + certfile = None if 'ssl_certfile' in self.connectArgs: - connSock = ssl(sock, certfile=self.connectArgs['ssl_certfile']) - else: - connSock = ssl(sock) + certfile = self.connectArgs['ssl_certfile'] + keyfile = None + if 'ssl_keyfile' in self.connectArgs: + keyfile = self.connectArgs['ssl_keyfile'] + connSock = ssl(sock, certfile=certfile, keyfile=keyfile) else: connSock = sock self.conn = Connection(connSock, username=self.authUser, password=self.authPass, @@ -2438,7 +2449,10 @@ class Broker(Thread): oldAborted = self.conn.aborted self.conn.aborted = aborted self.conn.start() - sock.settimeout(oldTimeout) + + # Bug (QPID-4337): don't enable non-blocking (timeouts) for old SSL + if not force_blocking: + sock.settimeout(oldTimeout) self.conn.aborted = oldAborted uid = self.conn.user_id if uid.__class__ == tuple and len(uid) == 2: |