Merge branch '2.5'

Conflicts:
	kombu/pidbox.py
	kombu/utils/__init__.py
	kombu/utils/eventio.py

1 files changed, 15 insertions, 0 deletions

diff --git a/kombu/transport/librabbitmq.py b/kombu/transport/librabbitmq.py
index ee6246c1..4ada8a55 100644
--- a/kombu/transport/librabbitmq.py
+++ b/kombu/transport/librabbitmq.py
@@ -9,6 +9,7 @@ kombu.transport.librabbitmq
 """
 from __future__ import absolute_import
 
+import os
 import socket
 
 try:
@@ -119,8 +120,22 @@ class Transport(base.Transport):
 
     def close_connection(self, connection):
         """Close the AMQP broker connection."""
+        self.client.drain_events = None
         connection.close()
 
+    def _collect(self, connection):
+        if connection is not None:
+            for channel in connection.channels.itervalues():
+                channel.connection = None
+            try:
+                os.close(connection.fileno())
+            except OSError:
+                pass
+            connection.channels.clear()
+            connection.callbacks.clear()
+        self.client.drain_events = None
+        self.client = None
+
     def verify_connection(self, connection):
         return connection.connected