Merge 3e43eec into c0667e1

paramiko · Jul 28, 2014 · 8cecb02 · 8cecb02
2 parents c0667e1 + 3e43eec
commit 8cecb02
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/paramiko/channel.py b/paramiko/channel.py
@@ -26,6 +26,7 @@
 import threading
 import socket
 import os
+import weakref
 
 from paramiko.common import *
 from paramiko import util
@@ -890,7 +891,7 @@ def shutdown_write(self):
 
 
     def _set_transport(self, transport):
-        self.transport = transport
+        self.transport = weakref.proxy(transport)
         self.logger = util.get_logger(self.transport.get_log_channel())
 
     def _set_window(self, window_size, max_packet_size):

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
@@ -3,6 +3,8 @@ Changelog
 =========
 
 * :release:`1.11.6 <2014-05-07>`
+* :bug:`-` Fixed a reference cycle with channel objects that was causing memory
+  leaks.  Thanks to Alex Philipp.
 * :bug:`-` Added self.args for exception classes. Used for unpickling. Related
   to (`Fabric #986 <https://github.com/fabric/fabric/issues/986>`_, `Fabric
   #714 <https://github.com/fabric/fabric/issues/714>`_). Thanks to Alex