Commit ac77c55b authored by Vasiliy Faronov's avatar Vasiliy Faronov Committed by Tim Graham
Browse files

Fixed #26567 -- Updated references to obsolete RFC2616. 

Didn't touch comments where it wasn't obvious that the code adhered to
the newer standard.
parent fb68674e

django/middleware/csrf.py

+1 −1
Original line number Diff line number Diff line
@@ -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.

django/test/client.py

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ def conditional_content_removal(request, response): 
    """

    Simulate the behavior of most Web servers by removing the content of

    responses for HEAD requests, 1xx, 204, and 304 responses. Ensures

    compliance with RFC 2616, section 4.3.

    compliance with RFC 7230, section 3.3.3.

    """

    if 100 <= response.status_code < 200 or response.status_code in (204, 304):

        if response.streaming:

django/utils/cache.py

+1 −1
Original line number Diff line number Diff line
@@ -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

django/utils/http.py

+3 −3
Original line number Diff line number Diff line
@@ -109,7 +109,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
@@ -122,7 +122,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.
@@ -130,7 +130,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)

django/views/defaults.py

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ def permission_denied(request, exception, template_name=ERROR_403_TEMPLATE_NAME) 
    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)