From: Guido van Rossum <guido@python.org>
Date: Tue, 29 Mar 2011 19:58:29 +0000 (-0700)
Subject: Merge issue 11662.
X-Git-Tag: v3.2.1b1~189^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20d2ab435e541f79a8e94d7b02696ee9f6e49c8d;p=python

Merge issue 11662.
---

20d2ab435e541f79a8e94d7b02696ee9f6e49c8d
diff --cc Misc/NEWS
index 3f1bb3450b,04c9faee93..104704658f
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -71,9 -54,6 +71,12 @@@ Librar
  
  - Issue #11628: cmp_to_key generated class should use __slots__
  
 +- Issue #11666: let help() display named tuple attributes and methods
 +  that start with a leading underscore.
 +
++- Issue #11662: Make urllib and urllib2 ignore redirections if the
++  scheme is not HTTP, HTTPS or FTP (CVE-2011-1521).
++
  - Issue #5537: Fix time2isoz() and time2netscape() functions of
    httplib.cookiejar for expiration year greater than 2038 on 32-bit systems.