diff options
| author | Kenneth Anthony Giusti <kgiusti@apache.org> | 2012-09-21 15:02:58 +0000 |
|---|---|---|
| committer | Kenneth Anthony Giusti <kgiusti@apache.org> | 2012-09-21 15:02:58 +0000 |
| commit | 1d55085f6f4fdf1a29ae7a468b189dabf9badef1 (patch) | |
| tree | 340f4e2ef7eff100eb00e4be5bc6604fa16faa77 /qpid/extras/qmf | |
| parent | fc62a60d120f829c2a9c3c173fb4e0db3dfba633 (diff) | |
| download | qpid-python-1d55085f6f4fdf1a29ae7a468b189dabf9badef1.tar.gz | |
QPID-4337: add SSL support for older python clients.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1388544 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/extras/qmf')
| -rw-r--r-- | qpid/extras/qmf/src/py/qmf/console.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/qpid/extras/qmf/src/py/qmf/console.py b/qpid/extras/qmf/src/py/qmf/console.py index af5d1da5ca..1fb23a047d 100644 --- a/qpid/extras/qmf/src/py/qmf/console.py +++ b/qpid/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,7 +2424,14 @@ 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) if 'ssl_certfile' in self.connectArgs: connSock = ssl(sock, certfile=self.connectArgs['ssl_certfile']) else: @@ -2438,7 +2446,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: |