formdata: use the mime-content type function #2282
Closed
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
Reduce code duplication by making Curl_mime_contenttype available and used by the formdata function. This also makes the formdata function recognize a set of more file extensions by default. PR #2280 brought this to my attention.
monnerat
reviewed
Feb 5, 2018
lib/formdata.c
Outdated
| @@ -627,9 +573,14 @@ CURLFORMcode FormAdd(struct curl_httppost **httppost, | |||
| !form->contenttype) { | |||
| char *f = form->flags & HTTPPOST_BUFFER? | |||
| form->showfilename : form->value; | |||
| char const *type = prevtype; | |||
| if(!type) | |||
There was a problem hiding this comment.
To stay compatible, prevtype should be used only if Curl_mime_contenttype(f) return NULL.
There was a problem hiding this comment.
Oops, you're right. Thanks. I'll fix!
monnerat
approved these changes
Feb 5, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Reduce code duplication by making Curl_mime_contenttype available and
used by the formdata function. This also makes the formdata function
recognize a set of more file extensions by default.
PR #2280 brought this to my attention.