From ccff08c194b0b7f8a86bf9c5dd6d5be473760a1b Mon Sep 17 00:00:00 2001 From: Rik Date: Tue, 10 Mar 2015 17:22:55 +0100 Subject: [PATCH] Fixed #24463 -- Removed mod_python functionality from HttpRequest._get_scheme() --- django/http/request.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/django/http/request.py b/django/http/request.py index 398cf20dfb..7989d064b6 100644 --- a/django/http/request.py +++ b/django/http/request.py @@ -1,7 +1,6 @@ from __future__ import unicode_literals import copy -import os import re import sys from io import BytesIO @@ -157,11 +156,14 @@ class HttpRequest(object): return iri_to_uri(location) def _get_scheme(self): - return 'https' if os.environ.get("HTTPS") == "on" else 'http' + """ + Hook for subclasses like WSGIRequest to implement. Returns 'http' by + default. + """ + return 'http' @property def scheme(self): - # First, check the SECURE_PROXY_SSL_HEADER setting. if settings.SECURE_PROXY_SSL_HEADER: try: header, value = settings.SECURE_PROXY_SSL_HEADER @@ -171,8 +173,6 @@ class HttpRequest(object): ) if self.META.get(header, None) == value: return 'https' - # Failing that, fall back to _get_scheme(), which is a hook for - # subclasses to implement. return self._get_scheme() def is_secure(self):