Skip to content

Canonical redirects: check if the project supports custom domains #10098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 6, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions readthedocs/proxito/views/serve.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from readthedocs.builds.constants import EXTERNAL, INTERNAL, LATEST, STABLE
from readthedocs.builds.models import Version
from readthedocs.core.mixins import CDNCacheControlMixin
from readthedocs.core.resolver import resolve_path
from readthedocs.core.resolver import resolve_path, resolver
from readthedocs.core.unresolver import (
InvalidExternalVersionError,
InvalidPathForVersionedProjectError,
Expand Down Expand Up @@ -281,7 +281,8 @@ def _get_canonical_redirect_type(self, request):
.filter(canonical=True, https=True)
.exists()
)
if canonical_domain:
# For .com we need to check if the project supports custom domains.
if canonical_domain and resolver._use_cname(project):
log.debug(
"Proxito Public Domain -> Canonical Domain Redirect.",
project_slug=project.slug,
Expand Down