Merged revisions 86006 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86006 | brian.curtin | 2010-10-30 19:34:23 -0500 (Sat, 30 Oct 2010) | 3 lines

  Fix ResourceWarning for an unclosed socket.
  test_return_header_keep_alive - Added a cleanup call for the socket.
........

Lib/test/test_httpservers.py

@@ -256,6 +256,7 @@ class BaseHTTPServerTestCase(BaseTestCase):
         res = self.con.getresponse()
         self.assertEqual(res.getheader('Connection'), 'keep-alive')
         self.con.request('TEST', '/')
+        self.addCleanup(self.con.close)
 
     def test_internal_key_error(self):
         self.con.request('KEYERROR', '/')