summaryrefslogtreecommitdiff
path: root/django/http
diff options
context:
space:
mode:
authorBoulder Sprinters <boulder-sprinters@djangoproject.com>2006-12-15 18:32:47 +0000
committerBoulder Sprinters <boulder-sprinters@djangoproject.com>2006-12-15 18:32:47 +0000
commit93d83df61195ea598bc0a2a5cdce1df8e88fcb6d (patch)
tree6adfa94e4d093f83c28c8b71de5bd2e1c0613669 /django/http
parent174463e62c732b33842e454f9763c5b066fc5af4 (diff)
boulder-oracle-sprint: Merged to trunk [4210].
git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@4212 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/http')
-rw-r--r--django/http/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/http/__init__.py b/django/http/__init__.py
index bb0e973aae..48f10329fd 100644
--- a/django/http/__init__.py
+++ b/django/http/__init__.py
@@ -208,7 +208,7 @@ class HttpResponse(object):
if path is not None:
self.cookies[key]['path'] = path
if domain is not None:
- self.cookies[key]['domain'] = path
+ self.cookies[key]['domain'] = domain
self.cookies[key]['expires'] = 0
self.cookies[key]['max-age'] = 0