Merge lp:~hopem/ubuntu/trusty/python-amqp/lp1472712 into lp:ubuntu/trusty/python-amqp

[Edward Hope-Morley]

[lp:~hopem/ubuntu/trusty/python-amqp/lp1472712]

5. By Edward Hope-Morley on 2015-08-06

[hopem,r=]

* Backport patch from 1.4.4 to ensure SSL timeouts raised properly (LP: #1472712)
  - d/p/dont-disconnect-transport-on-ssl-read-timeout.patch

[Brian Murray (brian-murray)]

Merged doesn't seem like the right status as the bzr branch hasn't been, but it seems that the same fix was uploaded to trusty-proposed (see bug 1472712) so I'm setting this to Rejected.

Unmerged revisions

5. By Edward Hope-Morley on 2015-08-06

[hopem,r=]

* Backport patch from 1.4.4 to ensure SSL timeouts raised properly (LP: #1472712)
  - d/p/dont-disconnect-transport-on-ssl-read-timeout.patch

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-07 20:32:33 +0000
+++ debian/changelog	2015-08-06 17:06:17 +0000
@@ -1,3 +1,10 @@
+python-amqp (1.3.3-1ubuntu2) trusty; urgency=medium
+
+  * Backport patch from 1.4.4 to ensure SSL timeouts raised properly (LP: #1472712)
+    - d/p/dont-disconnect-transport-on-ssl-read-timeout.patch
+
+ -- Edward Hope-Morley <[e-mail]>  Thu, 06 Aug 2015 15:17:01 +0100
+
 python-amqp (1.3.3-1ubuntu1) trusty; urgency=medium
 
   * Merge with Debian; remaining changes:

=== added file 'debian/patches/dont-disconnect-transport-on-ssl-read-timeout.patch'
--- debian/patches/dont-disconnect-transport-on-ssl-read-timeout.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/dont-disconnect-transport-on-ssl-read-timeout.patch	2015-08-06 17:06:17 +0000
@@ -0,0 +1,56 @@
+From 435c12777702be2a36c96006ea1880a6e051d943 Mon Sep 17 00:00:00 2001
+From: Craig Jellick <[e-mail]>
+Date: Wed, 26 Feb 2014 13:12:18 -0700
+Subject: [PATCH] Don't disconnect transport on SSL read timeout
+
+SSL socket read timeouts are not raised as socket.timeout exceptions.
+So, to have SSL socket read timeouts behave the same way as TCP socket
+read timeouts, we need to find them based off of their text and reraise
+as socket.timeout exceptions.
+
+This is similar to the fix in read_timeout in connection.py at:
+https://github.com/celery/py-amqp/blob/1.4/amqp/connection.py#L336-L337
+and in fact the exception raised here is eventually caught by
+read_timeout and replaced with a socket.timeout exception. The problem
+is that the transport is already marked as disconnected at that point.
+So, we need to catch the timeout here in transport.py
+---
+ amqp/transport.py | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+Index: python-amqp-1.3.3/amqp/transport.py
+===================================================================
+--- python-amqp-1.3.3.orig/amqp/transport.py	2015-08-06 15:20:04.927963910 +0100
++++ python-amqp-1.3.3/amqp/transport.py	2015-08-06 15:20:04.923963909 +0100
+@@ -46,6 +46,12 @@
+     # Python 2.5 and lower
+     bytes = str
+ 
++try:
++    from ssl import SSLError
++except ImportError:
++    class SSLError(Exception):  # noqa
++        pass
++
+ from struct import pack, unpack
+ 
+ from .exceptions import UnexpectedFrame
+@@ -166,6 +172,10 @@
+         except socket.timeout:
+             raise
+         except (OSError, IOError, socket.error) as exc:
++            # Don't disconnect for ssl read time outs
++            # http://bugs.python.org/issue10272
++            if isinstance(exc, SSLError) and 'timed out' in str(exc):
++                raise socket.timeout()
+             if get_errno(exc) not in _UNAVAIL:
+                 self.connected = False
+             raise
+@@ -258,6 +268,7 @@
+             s = s[n:]
+ 
+ 
++
+ class TCPTransport(_AbstractTransport):
+     """Transport that deals directly with TCP socket."""
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-11-06 08:38:39 +0000
+++ debian/patches/series	2015-08-06 17:06:17 +0000
@@ -1,1 +1,2 @@
 01_drop_issuetracker.patch
+dont-disconnect-transport-on-ssl-read-timeout.patch