File 0001-Always-treat-SSLError-timeouts-as-socket-t... of Package python-amqp

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Always-treat-SSLError-timeouts-as-socket-timeouts-24.patch of Package python-amqp (Revision 6bcb82da0b065704b98e1d2d65716ea9)

Currently displaying revision 6bcb82da0b065704b98e1d2d65716ea9 , Show latest

From bf122a05a21a8cc5bca314b0979f32c8026fc66e Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 31 Jan 2019 15:07:26 +0100
Subject: [PATCH] Always treat SSLError timeouts as socket timeouts (#247)

Without specifically handling this case, the socket.timeout()
was not raised sometimes causing the connection to lock up.

In the case we hit the errno was None, so the previous if
condition did not apply.

Co-Authored-By: aojeagarcia <aojeagarcia@suse.com>
---
 amqp/transport.py        |  4 ++++
 t/unit/test_transport.py | 18 +++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

Index: amqp-2.2.2/amqp/transport.py
===================================================================
--- amqp-2.2.2.orig/amqp/transport.py
+++ amqp-2.2.2/amqp/transport.py
@@ -345,6 +345,10 @@ class SSLTransport(_AbstractTransport):
                 try:
                     s = recv(n - len(rbuf))  # see note above
                 except socket.error as exc:
+                    # ssl.sock.read may cause a SSLerror without errno
+                    # http://bugs.python.org/issue10272
+                    if isinstance(exc, SSLError) and 'timed out' in str(exc):
+                        raise socket.timeout()
                     # ssl.sock.read may cause ENOENT if the
                     # operation couldn't be performed (Issue celery#1414).
                     if exc.errno in _errnos:

Places

File 0001-Always-treat-SSLError-timeouts-as-socket-timeouts-24.patch of Package python-amqp (Revision 6bcb82da0b065704b98e1d2d65716ea9)

Places