From cb33e553ee537da4915f9055f8cdf9bf32113aed Mon Sep 17 00:00:00 2001 From: Vasiliy Faronov Date: Mon, 2 May 2016 15:35:05 +0300 Subject: [1.9.x] Fixed #26567 -- Updated references to obsolete RFC2616. Didn't touch comments where it wasn't obvious that the code adhered to the newer standard. Backport of ac77c55bc5fc54cd763a7ae426784650a8cc97c9 from master --- django/http/utils.py | 2 +- django/middleware/csrf.py | 2 +- django/utils/cache.py | 2 +- django/utils/http.py | 6 +++--- django/views/defaults.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'django') diff --git a/django/http/utils.py b/django/http/utils.py index 3ea71cb892..b3074f65f9 100644 --- a/django/http/utils.py +++ b/django/http/utils.py @@ -12,7 +12,7 @@ Functions that modify an HTTP request or response in some way. def conditional_content_removal(request, response): """ Removes the content of responses for HEAD requests, 1xx, 204 and 304 - responses. Ensures compliance with RFC 2616, section 4.3. + responses. Ensures compliance with RFC 7230, section 3.3.3. """ if 100 <= response.status_code < 200 or response.status_code in (204, 304): if response.streaming: diff --git a/django/middleware/csrf.py b/django/middleware/csrf.py index 25fb7336dc..3134c6f222 100644 --- a/django/middleware/csrf.py +++ b/django/middleware/csrf.py @@ -123,7 +123,7 @@ class CsrfViewMiddleware(object): if getattr(callback, 'csrf_exempt', False): return None - # Assume that anything not defined as 'safe' by RFC2616 needs protection + # Assume that anything not defined as 'safe' by RFC7231 needs protection if request.method not in ('GET', 'HEAD', 'OPTIONS', 'TRACE'): if getattr(request, '_dont_enforce_csrf_checks', False): # Mechanism to turn off CSRF checks for test suite. diff --git a/django/utils/cache.py b/django/utils/cache.py index c8ab96fe3d..24f9825f06 100644 --- a/django/utils/cache.py +++ b/django/utils/cache.py @@ -6,7 +6,7 @@ that header-patching themselves. For information on the Vary header, see: - http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.44 + https://tools.ietf.org/html/rfc7231#section-7.1.4 Essentially, the "Vary" HTTP header defines which headers a cache should take into account when building its cache key. Requests with the same path but diff --git a/django/utils/http.py b/django/utils/http.py index 62e854da8a..c053185a8a 100644 --- a/django/utils/http.py +++ b/django/utils/http.py @@ -114,7 +114,7 @@ def cookie_date(epoch_seconds=None): def http_date(epoch_seconds=None): """ Formats the time to match the RFC1123 date format as specified by HTTP - RFC2616 section 3.3.1. + RFC7231 section 7.1.1.1. Accepts a floating point number expressed in seconds since the epoch, in UTC - such as that outputted by time.time(). If set to None, defaults to @@ -127,7 +127,7 @@ def http_date(epoch_seconds=None): def parse_http_date(date): """ - Parses a date format as specified by HTTP RFC2616 section 3.3.1. + Parses a date format as specified by HTTP RFC7231 section 7.1.1.1. The three formats allowed by the RFC are accepted, even if only the first one is still in widespread use. @@ -135,7 +135,7 @@ def parse_http_date(date): Returns an integer expressed in seconds since the epoch, in UTC. """ # emails.Util.parsedate does the job for RFC1123 dates; unfortunately - # RFC2616 makes it mandatory to support RFC850 dates too. So we roll + # RFC7231 makes it mandatory to support RFC850 dates too. So we roll # our own RFC-compliant parsing. for regex in RFC1123_DATE, RFC850_DATE, ASCTIME_DATE: m = regex.match(date) diff --git a/django/views/defaults.py b/django/views/defaults.py index d4651e6665..5d69a5d0a9 100644 --- a/django/views/defaults.py +++ b/django/views/defaults.py @@ -91,7 +91,7 @@ def permission_denied(request, exception, template_name='403.html'): Context: None If the template does not exist, an Http403 response containing the text - "403 Forbidden" (as per RFC 2616) will be returned. + "403 Forbidden" (as per RFC 7231) will be returned. """ try: template = loader.get_template(template_name) -- cgit v1.3