Support charset=utf-8 in Content-Type header #230
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
spaceorc
approved these changes
Oct 18, 2023
outring
reviewed
Oct 18, 2023
| @@ -37,7 +37,7 @@ class Header: | |||
| collections.abc.Mapping[str | multidict.istr, str] | multidict.CIMultiDictProxy[str] | multidict.CIMultiDict[str] | |||
| ) | |||
|
|
|||
| json_re = re.compile(r"^application/(?:[\w.+-]+?\+)?json", re.RegexFlag.IGNORECASE) | |||
| json_re = re.compile(r"^application/(?:[\w.+-]+?\+)?json(;\w+charset\w+=\w+utf-8\w+)?", re.RegexFlag.IGNORECASE) | |||
There was a problem hiding this comment.
I'd stick with minimal implementation according to the spec: https://www.rfc-editor.org/rfc/rfc9110#field.content-type
Basically we don't need to look at anything after the first ;
Btw, not sure how does the current regex cause problems because it doesn't have $ at the end so it should match ; charset=xxx suffixes 🤔
There was a problem hiding this comment.
There was a problem hiding this comment.
Looking at the regex now and found one more issue in the existing one. We have a + in character class at (?:[\w.+-]+?\+) capture but we expect it to be terminated at the first +, so to disambiguate it we must either remove + from character class (?:[\w.-]+?\+) or make it greedy (?:[\w.+-]+\+)
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.
No description provided.