SF patch #1116583: NameError in cookielib domain check

diff --git a/Lib/cookielib.py b/Lib/cookielib.py
index a125b219867528f9b753129742cdff5d2892c001..86479f864adaa7b9b3c1d85fda7673cf72d8e28e 100644 (file)
--- a/Lib/cookielib.py
+++ b/Lib/cookielib.py
@@ -1134,11 +1134,10 @@ class DefaultCookiePolicy(CookiePolicy):
         # having to load lots of MSIE cookie files unless necessary.
         req_host, erhn = eff_request_host(request)
         if not req_host.startswith("."):
-            dotted_req_host = "."+req_host
+            req_host = "."+req_host
         if not erhn.startswith("."):
-            dotted_erhn = "."+erhn
-        if not (dotted_req_host.endswith(domain) or
-                dotted_erhn.endswith(domain)):
+            erhn = "."+erhn
+        if not (req_host.endswith(domain) or erhn.endswith(domain)):
             #debug("   request domain %s does not match cookie domain %s",
             #      req_host, domain)
             return False

diff --git a/Misc/ACKS b/Misc/ACKS
index 3c192ad1d5ad49e57ae35bd5d63ad5f594f7c319..19e1ded0d4b5986326ebc9024ceefaa6a9f587d7 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -399,6 +399,7 @@ Luke Mewburn
 Mike Meyer
 Steven Miale
 Trent Mick
+Chad Miller
 Roman Milner
 Dom Mitchell
 Doug Moen

diff --git a/Misc/NEWS b/Misc/NEWS
index d816bcc5487ce0172e568a4c32b42b8d3eca3ea5..9d3e9c009438a76379594e655d3742516bad8bef 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -51,6 +51,8 @@ Extension Modules
 Library
 -------
 
+- Fixed bug in a NameError bug in cookielib.  Patch #1116583.
+
 - Applied a security fix to SimpleXMLRPCserver (PSF-2005-001).  This
   disables recursive traversal through instance attributes, which can
   be exploited in various ways.