Merged revisions 80428 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80428 | antoine.pitrou | 2010-04-24 01:25:45 +0200 (sam., 24 avril 2010) | 4 lines

  Issue #5238: Calling makefile() on an SSL object would prevent the
  underlying socket from being closed until all objects get truely destroyed.
........

diff --git a/Lib/ssl.py b/Lib/ssl.py
index 0ebef58d69c4cc00a261b7f418c933ee36a3baf4..3ee3d6ac0b2c7d2b22c65d88721f802e4659c98e 100644 (file)
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -320,7 +320,9 @@ class SSLSocket(socket):
         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)
 
 
 

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index ef82ed3e92455f2d73535fa4b525519fec18856f..c1de0c1efb1b39861e26fa7e7ae1e4cb286a99e6 100644 (file)
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -9,7 +9,9 @@ import select
 import errno
 import subprocess
 import time
+import gc
 import os
+import errno
 import pprint
 import urllib, urlparse
 import shutil
@@ -123,6 +125,26 @@ class BasicTests(unittest.TestCase):
         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()
+        try:
+            os.read(fd, 0)
+        except OSError, e:
+            self.assertEqual(e.errno, errno.EBADF)
+        else:
+            self.fail("OSError wasn't raised")
+
+
 class NetworkedTests(unittest.TestCase):
 
     def testConnect(self):

diff --git a/Misc/NEWS b/Misc/NEWS
index 291109688f81e35acfb53642ad7a9ceddb430f76..0d07c73f226392cbcd278ca095e28e38bcbb2ae8 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,9 @@ Core and Builtins
 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ó.