Ticket #4685: check_protocol.2.diff

django/views/defaults.py

@@ -21 +21 @@
     # if necessary.
 
     # If the object actually defines a domain, we're done.
-    if absurl.startswith('http://'):
+    if absurl.startswith('http://') or absurl.startswith('https://'):
         return http.HttpResponseRedirect(absurl)
 
     object_domain = None
@@ -61 +61 @@
     # If all that malarkey found an object domain, use it; otherwise fall back
     # to whatever get_absolute_url() returned.
     if object_domain is not None:
-        return http.HttpResponseRedirect('http://%s%s' % (object_domain, absurl))
+        protocol = request.is_secure() and 'https' or 'http'
+        return http.HttpResponseRedirect('%s://%s%s' % (protocol, object_domain, absurl))
     else:
         return http.HttpResponseRedirect(absurl)