[Python-checkins] python/dist/src/Lib cookielib.py,1.4,1.4.2.1

Sat Feb 5 02:33:19 CET 2005

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15465
Modified Files:
 Tag: release24-maint
	cookielib.py 
Log Message:
SF patch #1116583: NameError in cookielib domain check
Index: cookielib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/cookielib.py,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1

--- cookielib.py	17 Oct 2004 16:23:52 -0000	1.4
+++ cookielib.py	5 Feb 2005 01:33:16 -0000	1.4.2.1
@@ -1134,11 +1134,10 @@
 # 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
