Permalink
Browse files

Fixed #5562 -- Changed settings of Expires heading when expiring a co…

…okie to

work with non-compliant browsers (also removes a non-compliance feature of our
own). Thanks, caifen1985@gmail.com and SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6549 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 570e893 commit e60c26d5bb9960866700eccd3392711e523a90e6 @malcolmt malcolmt committed Oct 20, 2007
Showing with 2 additions and 7 deletions.
  1. +2 −7 django/http/__init__.py
View
9 django/http/__init__.py
@@ -308,13 +308,8 @@ def set_cookie(self, key, value='', max_age=None, expires=None, path='/', domain
self.cookies[key][var.replace('_', '-')] = val
def delete_cookie(self, key, path='/', domain=None):
- self.cookies[key] = ''
- if path is not None:
- self.cookies[key]['path'] = path
- if domain is not None:
- self.cookies[key]['domain'] = domain
- self.cookies[key]['expires'] = 0
- self.cookies[key]['max-age'] = 0
+ self.set_cookie(key, max_age=0, path=path, domain=domain,
+ expires='Thu, 01-Jan-1970 00:00:00 GMT')
def _get_content(self):
if self.has_header('Content-Encoding'):

0 comments on commit e60c26d

Please sign in to comment.