From 1ad49feb71418f26aa6114c7a20ce1463beb3ea9 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 23 Jan 2020 13:39:27 +0100 Subject: global_init: assume the EINTR bit by default - Removed from global_init since it isn't thread-safe. The symbol will still remain to not break compiles, it just won't have any effect going forward. - make the internals NOT loop on EINTR (the opposite from previously). It only risks returning from the select/poll/wait functions early, and that should be risk-free. Closes #4840 --- lib/easy.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/easy.c') diff --git a/lib/easy.c b/lib/easy.c index d1b60861f..0ad33c02b 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -193,8 +193,12 @@ static CURLcode global_init(long flags, bool memoryfuncs) } #endif - if(flags & CURL_GLOBAL_ACK_EINTR) - Curl_ack_eintr = 1; +#ifdef USE_WOLFSSH + if(WS_SUCCESS != wolfSSH_Init()) { + DEBUGF(fprintf(stderr, "Error: wolfSSH_Init failed\n")); + return CURLE_FAILED_INIT; + } +#endif init_flags = flags; -- cgit v1.2.3