Author: antoine.pitrou
Date: Sat Apr 24 01:25:45 2010
New Revision: 80428
Log:
Issue #5238: Calling makefile() on an SSL object would prevent the
underlying socket from being closed until all objects get truely destroyed.
Modified:
python/trunk/Lib/ssl.py
python/trunk/Lib/test/test_ssl.py
python/trunk/Misc/NEWS
Modified: python/trunk/Lib/ssl.py
==============================================================================
--- python/trunk/Lib/ssl.py (original)
+++ python/trunk/Lib/ssl.py Sat Apr 24 01:25:45 2010
@@ -324,7 +324,9 @@
from the socket module."""
self._makefile_refs += 1
- return _fileobject(self, mode, bufsize)
+ # close=True so as to decrement the reference count when done with
+ # the file-like object.
+ return _fileobject(self, mode, bufsize, close=True)
Modified: python/trunk/Lib/test/test_ssl.py
==============================================================================
--- python/trunk/Lib/test/test_ssl.py (original)
+++ python/trunk/Lib/test/test_ssl.py Sat Apr 24 01:25:45 2010
@@ -7,7 +7,9 @@
import socket
import select
import time
+import gc
import os
+import errno
import pprint
import urllib, urlparse
import traceback
@@ -165,6 +167,22 @@
del ss
self.assertEqual(wr(), None)
+ def test_makefile_close(self):
+ # Issue #5238: creating a file-like object with makefile() shouldn't
+ # leak the underlying file descriptor.
+ ss = ssl.wrap_socket(socket.socket(socket.AF_INET))
+ fd = ss.fileno()
+ f = ss.makefile()
+ f.close()
+ # The fd is still open
+ os.read(fd, 0)
+ # Closing the SSL socket should close the fd too
+ ss.close()
+ gc.collect()
+ with self.assertRaises(OSError) as e:
+ os.read(fd, 0)
+ self.assertEqual(e.exception.errno, errno.EBADF)
+
class NetworkedTests(unittest.TestCase):
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS (original)
+++ python/trunk/Misc/NEWS Sat Apr 24 01:25:45 2010
@@ -25,6 +25,9 @@
Library
-------
+- Issue #5238: Calling makefile() on an SSL object would prevent the
+ underlying socket from being closed until all objects get truely destroyed.
+
- Issue #7943: Fix circular reference created when instantiating an SSL
socket. Initial patch by Péter Szabó.