From 6849c5f3d5ed14743fa8f45fb4b2bba027ec9a62 Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Tue, 4 Jan 2011 04:02:42 +0000 Subject: [PATCH] [1.2.X] Fixed sending mail on 404s to fail silently. A failure in the e-mail system should not turn a 404 into a 500. Backport of [15145] from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15146 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/middleware/common.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/django/middleware/common.py b/django/middleware/common.py index 0be89d4382..7c748c812a 100644 --- a/django/middleware/common.py +++ b/django/middleware/common.py @@ -94,7 +94,8 @@ class CommonMiddleware(object): ip = request.META.get('REMOTE_ADDR', '') 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.