summaryrefslogtreecommitdiff
path: root/django/utils/http.py
diff options
context:
space:
mode:
authorDenis Cornehl <syphar@fastmail.fm>2016-01-05 08:09:10 +0100
committerTim Graham <timograham@gmail.com>2016-01-05 09:41:13 -0500
commitee2835e69c47d02e8bce5a496bf8bd9f93b04fb4 (patch)
treedccba382988875d2e87f531f3042dba24df7e643 /django/utils/http.py
parent775291d4c767cd17dc5bbd2e8a605fd4fdfd8aed (diff)
[1.9.x] Fixed #26024 -- Fixed regression in ConditionalGetMiddleware ETag support.
Backport of 186b6c61bfe85afa4d6bf213d04a28dd2853fed2 from master
Diffstat (limited to 'django/utils/http.py')
-rw-r--r--django/utils/http.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/django/utils/http.py b/django/utils/http.py
index 8bbafaedec..70bcbd90ac 100644
--- a/django/utils/http.py
+++ b/django/utils/http.py
@@ -253,6 +253,13 @@ def quote_etag(etag):
return '"%s"' % etag.replace('\\', '\\\\').replace('"', '\\"')
+def unquote_etag(etag):
+ """
+ Unquote an ETag string; i.e. revert quote_etag().
+ """
+ return etag.strip('"').replace('\\"', '"').replace('\\\\', '\\') if etag else etag
+
+
def is_same_domain(host, pattern):
"""
Return ``True`` if the host is either an exact match or a match