Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #2503 -- Fixed HttpResponse.delete_cookie() to work properly. I…

…t now takes path and domain as optional keyword arguments.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3545 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 925c711cf75072526ced0ae8f18d561dca612092 1 parent 2c370e1
@adrianholovaty adrianholovaty authored
Showing with 15 additions and 8 deletions.
  1. +9 −6 django/http/__init__.py
  2. +6 −2 docs/request_response.txt
View
15 django/http/__init__.py
@@ -38,7 +38,7 @@ def has_key(self, key):
def get_full_path(self):
return ''
-
+
def is_secure(self):
return os.environ.get("HTTPS") == "on"
@@ -203,11 +203,14 @@ def set_cookie(self, key, value='', max_age=None, expires=None, path='/', domain
if val is not None:
self.cookies[key][var.replace('_', '-')] = val
- def delete_cookie(self, key):
- try:
- self.cookies[key]['max_age'] = 0
- except KeyError:
- pass
+ 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'] = path
+ self.cookies[key]['expires'] = 0
+ self.cookies[key]['max-age'] = 0
def _get_content(self):
content = ''.join(self._iterator)
View
8 docs/request_response.txt
@@ -149,7 +149,7 @@ Methods
Returns the ``path``, plus an appended query string, if applicable.
Example: ``"/music/bands/the_beatles/?print=true"``
-
+
``is_secure()``
Returns ``True`` if the request is secure; that is, if it was made with
HTTPS.
@@ -380,10 +380,14 @@ Methods
.. _`cookie Morsel`: http://www.python.org/doc/current/lib/morsel-objects.html
-``delete_cookie(key)``
+``delete_cookie(key, path='/', domain=None)``
Deletes the cookie with the given key. Fails silently if the key doesn't
exist.
+ The ``path`` and ``domain`` arguments are new in the Django development version.
+ Due to the way cookies work, ``path`` and ``domain`` should be the same
+ values you used in ``set_cookie()`` -- otherwise the cookie may not be deleted.
+
``content``
Returns the content as a Python string, encoding it from a Unicode object
if necessary. Note this is a property, not a method, so use ``r.content``
Please sign in to comment.
Something went wrong with that request. Please try again.