diff options
| author | Jason Pellerin <jpellerin@gmail.com> | 2006-12-04 21:12:29 +0000 |
|---|---|---|
| committer | Jason Pellerin <jpellerin@gmail.com> | 2006-12-04 21:12:29 +0000 |
| commit | 55d7f6519c8d13a685cff3f9873b5784fc511a87 (patch) | |
| tree | 60fb20e60dbf1f2505cce84f6807f6cdde40e261 /django/http | |
| parent | 0162eac9e2cd317476dd4086c36caf138c96f6bc (diff) | |
[multi-db] Merged trunk to [4158]. Some tests still failing.
git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@4159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/http')
| -rw-r--r-- | django/http/__init__.py | 2 |
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 |