From 4ceaeda1ec0b10013f3507548f608a3f7ad1b27d Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Thu, 19 Mar 2020 13:20:47 -0700 Subject: [PATCH] Check 404 page once when slug and default_version is the same --- common | 2 +- readthedocs/proxito/views/serve.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common b/common index e3ae8229018..3e5ffe3ff63 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit e3ae8229018c4026d897f6e54e67bfe5cdea66a0 +Subproject commit 3e5ffe3ff631adbfa26ea09a7880d52fdd77a8db diff --git a/readthedocs/proxito/views/serve.py b/readthedocs/proxito/views/serve.py index 672030a1254..a5fd2f56835 100644 --- a/readthedocs/proxito/views/serve.py +++ b/readthedocs/proxito/views/serve.py @@ -261,7 +261,7 @@ def get(self, request, proxito_path, template_name='404.html'): # If that doesn't work, attempt to serve the 404 of the current version (version_slug) # Secondly, try to serve the 404 page for the default version # (project.get_default_version()) - for version_slug_404 in [version_slug, final_project.get_default_version()]: + for version_slug_404 in set([version_slug, final_project.get_default_version()]): for tryfile in ('404.html', '404/index.html'): storage_root_path = final_project.get_storage_path( type_='html',