summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2009-04-12 02:23:19 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2009-04-12 02:23:19 +0000
commit54800be3a14911d69c658845dfc6a0f100997d47 (patch)
tree5672837421f73b052d8f61dc1913cacf3e617e43
parent77066516a066d69b3c396db40f3855c06f1f1f3f (diff)
Fixed #9577 --Fixed URL display in the debug template.
Patch from Thomas Güttler. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10534 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/views/debug.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/django/views/debug.py b/django/views/debug.py
index 650aebae10..4e9dcb1d7c 100644
--- a/django/views/debug.py
+++ b/django/views/debug.py
@@ -101,7 +101,6 @@ class ExceptionReporter:
'frames': frames,
'lastframe': frames[-1],
'request': self.request,
- 'request_protocol': self.request.is_secure() and "https" or "http",
'settings': get_safe_settings(),
'sys_executable': sys.executable,
'sys_version_info': '%d.%d.%d' % sys.version_info[0:3],
@@ -260,7 +259,6 @@ def technical_404_response(request, exception):
'urlpatterns': tried,
'reason': smart_str(exception, errors='replace'),
'request': request,
- 'request_protocol': request.is_secure() and "https" or "http",
'settings': get_safe_settings(),
})
return HttpResponseNotFound(t.render(c), mimetype='text/html')
@@ -399,7 +397,7 @@ TECHNICAL_500_TEMPLATE = """
</tr>
<tr>
<th>Request URL:</th>
- <td>{{ request_protocol }}://{{ request.META.HTTP_HOST }}{{ request.path_info|escape }}</td>
+ <td>{{ request.build_absolute_uri|escape }}</td>
</tr>
<tr>
<th>Exception Type:</th>
@@ -529,7 +527,7 @@ TECHNICAL_500_TEMPLATE = """
Environment:
Request Method: {{ request.META.REQUEST_METHOD }}
-Request URL: {{ request_protocol }}://{{ request.META.HTTP_HOST }}{{ request.path_info|escape }}
+Request URL: {{ request.build_absolute_uri|escape }}
Django Version: {{ django_version_info }}
Python Version: {{ sys_version_info }}
Installed Applications:
@@ -741,7 +739,7 @@ TECHNICAL_404_TEMPLATE = """
</tr>
<tr>
<th>Request URL:</th>
- <td>{{ request_protocol }}://{{ request.META.HTTP_HOST }}{{ request.path_info|escape }}</td>
+ <td>{{ request.build_absolute_uri|escape }}</td>
</tr>
</table>
</div>