summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2011-01-04 04:01:37 +0000
committerLuke Plant <L.Plant.98@cantab.net>2011-01-04 04:01:37 +0000
commitc0dd2babb153f1c82bd38f211a32602620dce177 (patch)
treed5f602961fa17c76c3907582e4838cdea890550f
parent30fbe92ebfdaa870b3f69197214366d2d4cf1eb8 (diff)
Fixed sending mail on 404s to fail silently.
A failure in the e-mail system should not turn a 404 into a 500. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15145 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/middleware/common.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/middleware/common.py b/django/middleware/common.py
index 87efae6181..b99aad08cd 100644
--- a/django/middleware/common.py
+++ b/django/middleware/common.py
@@ -104,7 +104,8 @@ class CommonMiddleware(object):
ip = request.META.get('REMOTE_ADDR', '<none>')
mail_managers("Broken %slink on %s" % ((is_internal and 'INTERNAL ' or ''), domain),
"Referrer: %s\nRequested URL: %s\nUser agent: %s\nIP address: %s\n" \
- % (referer, request.get_full_path(), ua, ip))
+ % (referer, request.get_full_path(), ua, ip),
+ fail_silently=True)
return response
# Use ETags, if requested.