summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2016-05-10 08:29:34 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2016-05-10 08:29:34 (GMT)
commit09f1679a401a94b0626ab1e100aaaea271dbf3c0 (patch)
treec152f0dd5272cbfbc4b0c1244ab92bf5a0386cff
parentb5a67dec9841b62e4fb4728ff754323592946f17 (diff)
downloadcpython-09f1679a401a94b0626ab1e100aaaea271dbf3c0.zip
cpython-09f1679a401a94b0626ab1e100aaaea271dbf3c0.tar.gz
cpython-09f1679a401a94b0626ab1e100aaaea271dbf3c0.tar.bz2
Add NEWS entry for issue26960.
-rw-r--r--Misc/NEWS3
1 files changed, 3 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 0f55e76..52ad068 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -77,6 +77,9 @@ Core and Builtins
Library
-------
+- Issue #26960: Backported #16270 from Python 3 to Python 2, to prevent urllib
+ from hanging when retrieving certain FTP files.
+
- Issue #25745: Fixed leaking a userptr in curses panel destructor.
- Issue #17765: weakref.ref() no longer silently ignores keyword arguments.