diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-11-23 17:02:48 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-11-27 08:50:33 +0100 |
| commit | d661b0afb571a68ec11f3dd856aba304c80780ba (patch) | |
| tree | b3ba2de4b23e42287671bc1349e85f7e5bbd8791 /lib/easy.c | |
| parent | 7f2a1df6f5fc598750b2c6f34465c8d924db28cc (diff) | |
| download | curl-d661b0afb571a68ec11f3dd856aba304c80780ba.tar.gz | |
global_init: ignore CURL_GLOBAL_SSL's absense
This bit is no longer used. It is not clear what it meant for users to
"init the TLS" in a world with different TLS backends and since the
introduction of multissl, libcurl didn't properly work if inited without
this bit set.
Not a single user responded to the call for users of it:
https://curl.haxx.se/mail/lib-2017-11/0072.html
Reported-by: Evgeny Grin
Assisted-by: Jay Satiro
Fixes #2089
Fixes #2083
Closes #2107
Diffstat (limited to 'lib/easy.c')
| -rw-r--r-- | lib/easy.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/easy.c b/lib/easy.c index 2f5cc7f89..5917db36a 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -215,11 +215,10 @@ static CURLcode global_init(long flags, bool memoryfuncs) #endif } - if(flags & CURL_GLOBAL_SSL) - if(!Curl_ssl_init()) { - DEBUGF(fprintf(stderr, "Error: Curl_ssl_init failed\n")); - return CURLE_FAILED_INIT; - } + if(!Curl_ssl_init()) { + DEBUGF(fprintf(stderr, "Error: Curl_ssl_init failed\n")); + return CURLE_FAILED_INIT; + } if(flags & CURL_GLOBAL_WIN32) if(win32_init()) { @@ -319,10 +318,7 @@ void curl_global_cleanup(void) return; Curl_global_host_cache_dtor(); - - if(init_flags & CURL_GLOBAL_SSL) - Curl_ssl_cleanup(); - + Curl_ssl_cleanup(); Curl_resolver_global_cleanup(); if(init_flags & CURL_GLOBAL_WIN32) |