Extract actual Content-Type from the header #1933
Merged
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
irevoire
reviewed
Nov 24, 2021
irevoire
approved these changes
Nov 24, 2021
Kerollmops
force-pushed
the
charset-content-type
branch
from
756a641
to
688b8a9
Compare
MarinPostma
suggested changes
Nov 24, 2021
Comment on lines
284
to
294
| match headers.get(CONTENT_TYPE) { | ||
| Some(value) => match value.to_str() { | ||
| Ok(content) => Some( | ||
| content | ||
| .split_once(";") | ||
| .map_or(content, |(ct, _)| ct.trim()) | ||
| .to_string(), | ||
| ), | ||
| Err(_) => Some(format!("{}", value.as_bytes().as_bstr())), // convenient bytes display | ||
| }, | ||
| None => None, |
There was a problem hiding this comment.
I would prefer that we use this method that is implemented on HttpRequest, and leverage the Mine library, instead of doing this ourselves
There was a problem hiding this comment.
Wow, didn't see this, that's awesome. The only difference that I see with my function is that it will not try to return a malformed content-type, one that is not utf-8 encoded for example, and we will not be able to return it in the error messages. But, not sure that's very important. Changing my PR to use this method, thank you!
Kerollmops
force-pushed
the
charset-content-type
branch
from
21b8dcc
to
3d7ca58
Compare
irevoire
approved these changes
Nov 24, 2021
MarinPostma
suggested changes
Nov 24, 2021
MarinPostma
approved these changes
Nov 25, 2021
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.
This PR should fix #1866 by extracting the actual Content-Type from the header and ignoring everything that follows the first semicolon (
;) which, most of the time, means ignoring thecharset=utf-8. We use themime_typemethod to do so.