Avoid returning invalid domain when using USE_SUBDOMAIN=True in dev #6026
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When running in development with USE_SUBDOMAIN=True and PRODUCTION_DOMAIN=dev.readthedocs.io:8000 we receive an error when accessing the docs. This allows this case to succeed, skip these checks and serve the docs properly.
stsewd
reviewed
Aug 1, 2019
| @@ -61,7 +61,7 @@ def process_request(self, request): | |||
| # Serve CNAMEs | |||
| if ( | |||
| public_domain not in host and | |||
| settings.PRODUCTION_DOMAIN not in host and | |||
| settings.PRODUCTION_DOMAIN not in (host, full_host) and | |||
There was a problem hiding this comment.
This isn't the same as the previous logic. This is checking that production_domain is exactly the same as host or full_host. Or that is what this change is for?
There was a problem hiding this comment.
Yes. That's the intended change and it's because in development the PRODUCTION_DOMAIN contains the port which is not in host but it's on full_host.
stsewd
approved these changes
Aug 21, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When running in development with
USE_SUBDOMAIN=TrueandPRODUCTION_DOMAIN=dev.readthedocs.io:8000we receive an error whenaccessing the docs.
This allows this case to succeed,
skip these checks and serve the docs properly.