romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 00:13:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib: sanitize conditional exclusion around MIME

Browse source 
The introduction of CURL_DISABLE_MIME came with some additional bugs:
- Disabled MIME is compiled-in anyway if SMTP and/or IMAP is enabled.
- CURLOPT_MIMEPOST, CURLOPT_MIME_OPTIONS and CURLOPT_HTTPHEADER are
  conditioned on HTTP, although also needed for SMTP and IMAP MIME mail
  uploads.

In addition, the CURLOPT_HTTPHEADER and --header documentation does not
mention their use for MIME mail.

This commit fixes the problems above.

Closes #9610
This commit is contained in:
Patrick Monnerat 2022-09-28 18:12:15 +02:00 • committed by Daniel Stenberg
parent 75670e4573
commit 2437fac013
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
7 changed files with 101 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tool_listhelp.c
View file

@ -251,7 +251,7 @@ const struct helptxt helptext[] = {
CURLHELP_HTTP | CURLHELP_FTP | CURLHELP_FILE},
{"-H, --header <header/@file>",
"Pass custom header(s) to server",
CURLHELP_HTTP},
CURLHELP_HTTP | CURLHELP_IMAP | CURLHELP_SMTP},
{"-h, --help <category>",
"Get help for commands",
CURLHELP_IMPORTANT | CURLHELP_CURL},