generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tool_operate: Fix CURLOPT_SSL_OPTIONS for builds without HTTPS

Browse Source 
- Set CURLOPT_SSL_OPTIONS only if the tool enabled an SSL option.

Broken by me several days ago in 172b2be.
https://github.com/bagder/curl/commit/172b2be#diff-70b44ee478e58d4e1ddcf9c9a73d257b

Bug: http://curl.haxx.se/mail/lib-2015-07/0119.html
Reported-by: Dan Fandrich
This commit is contained in:
Jay Satiro
2015-07-25 16:32:15 -04:00
parent a284b0ebc4
commit b46a7744bc
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/tool_operate.c
View File

@@ -1328,9 +1328,12 @@ static CURLcode operate_do(struct GlobalConfig *global,
config->gssapi_delegation); config->gssapi_delegation);
/* new in 7.25.0 */ /* new in 7.25.0 */
my_setopt_bitmask(curl, CURLOPT_SSL_OPTIONS, {
(long)((config->ssl_allow_beast ? CURLSSLOPT_ALLOW_BEAST : 0) | long mask = (config->ssl_allow_beast ? CURLSSLOPT_ALLOW_BEAST : 0) |
(config->ssl_no_revoke ? CURLSSLOPT_NO_REVOKE : 0))); (config->ssl_no_revoke ? CURLSSLOPT_NO_REVOKE : 0);
if(mask)
my_setopt_bitmask(curl, CURLOPT_SSL_OPTIONS, mask);
}
if(config->mail_auth) if(config->mail_auth)
my_setopt_str(curl, CURLOPT_MAIL_AUTH, config->mail_auth); my_setopt_str(curl, CURLOPT_MAIL_AUTH, config->mail_auth);