From 43ef7f3599d448aa3501810a3198a8428d3e630d Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Wed, 21 Sep 2016 13:45:01 +0200 Subject: [PATCH] Allow message-ids with a slash in them This is specifically allowed in the standard for message-ids, and broke rendinering of about 300 messages in total. This requires reordering the regexps for the message-id links to check for /flat/ and /raw/ first, sinc ethey would otherwise be considered a part of the messageid. --- django/archives/urls.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/django/archives/urls.py b/django/archives/urls.py index 43b2530..18d3d20 100644 --- a/django/archives/urls.py +++ b/django/archives/urls.py @@ -24,9 +24,9 @@ urlpatterns = patterns('', (r'^(?Pmessage-id/(|flat/|raw/))<(?P.*)>$', 'archives.mailarchives.views.re_redirect'), # Match regular messages - (r'^message-id/([^/]+)$', 'archives.mailarchives.views.message'), - (r'^message-id/flat/([^/]+)$', 'archives.mailarchives.views.message_flat'), - (r'^message-id/raw/([^/]+)$', 'archives.mailarchives.views.message_raw'), + (r'^message-id/flat/(.+)$', 'archives.mailarchives.views.message_flat'), + (r'^message-id/raw/(.+)$', 'archives.mailarchives.views.message_raw'), + (r'^message-id/(.+)$', 'archives.mailarchives.views.message'), # Search (r'^archives-search/', 'archives.mailarchives.views.search'), -- 2.39.5