Commit b46a7744 authored by Jay Satiro's avatar Jay Satiro
Browse files

tool_operate: Fix CURLOPT_SSL_OPTIONS for builds without HTTPS 

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

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

Bug: http://curl.haxx.se/mail/lib-2015-07/0119.html
Reported-by: Dan Fandrich
parent a284b0eb

src/tool_operate.c

+6 −3
Original line number Diff line number Diff line
@@ -1328,9 +1328,12 @@ static CURLcode operate_do(struct GlobalConfig *global, 
                        config->gssapi_delegation);



        /* new in 7.25.0 */

        my_setopt_bitmask(curl, CURLOPT_SSL_OPTIONS,

          (long)((config->ssl_allow_beast ? CURLSSLOPT_ALLOW_BEAST : 0) |

                 (config->ssl_no_revoke ? CURLSSLOPT_NO_REVOKE : 0)));

        {

          long mask = (config->ssl_allow_beast ? CURLSSLOPT_ALLOW_BEAST : 0) |

                      (config->ssl_no_revoke ? CURLSSLOPT_NO_REVOKE : 0);

          if(mask)

            my_setopt_bitmask(curl, CURLOPT_SSL_OPTIONS, mask);

        }



        if(config->mail_auth)

          my_setopt_str(curl, CURLOPT_MAIL_AUTH, config->mail_auth);