diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index 95dfb88d2a0..26e45399d58 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -977,6 +977,7 @@ class HandlerTests(unittest.TestCase): h = urllib2.HTTPRedirectHandler() o = h.parent = MockOpener() req = Request(from_url) + req.timeout = socket._GLOBAL_DEFAULT_TIMEOUT for scheme in invalid_schemes: invalid_url = scheme + '://' + schemeless_url diff --git a/Misc/NEWS b/Misc/NEWS index c671107f6e8..9b68a72c0d7 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -16,9 +16,6 @@ Core and Builtins - Issue #11450: Don't truncate hg version info in Py_GetBuildInfo() when there are many tags (e.g. when using mq). Patch by Nadeem Vawda. -- Issue #11662: Make urllib and urllib2 ignore redirections if the - scheme is not HTTP, HTTPS or FTP (CVE-2011-1521). - - Issue #10451: memoryview objects could allow to mutate a readable buffer. Initial patch by Ross Lagerwall. @@ -50,6 +47,9 @@ Core and Builtins Library ------- +- Issue #11662: Make urllib and urllib2 ignore redirections if the + scheme is not HTTP, HTTPS or FTP (CVE-2011-1521). + - Issue #11256: Fix inspect.getcallargs on functions that take only keyword arguments.