Merged revisions 73145 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73145 | kristjan.jonsson | 2009-06-02 06:14:08 -0700 (Tue, 02 Jun 2009) | 2 lines

  http://bugs.python.org/issue6117
  Fix O(n**2) performance problem in socket._fileobject
........
diff --git a/Misc/NEWS b/Misc/NEWS
index 20692a0..8b0f7ab 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -70,6 +70,9 @@
 Library
 -------
 
+- Issue #6117: Fix O(n**2) performance degradation when outputting lots of
+  small data on a buffered socket.socket.makefile() object.
+
 - Issue #6637: defaultdict.copy() did not work when the default factory
   was left unspecified.  Also, the eval/repr round-trip would fail when
   the default_factory was None.