aboutsummaryrefslogtreecommitdiff
path: root/lib/easy.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-01-23 13:39:27 +0100
committerDaniel Stenberg <daniel@haxx.se>2020-01-26 18:27:18 +0100
commit1ad49feb71418f26aa6114c7a20ce1463beb3ea9 (patch)
treecb72ace04016e81eb1e62d81fe1b4ce0ee13dfda /lib/easy.c
parent34e6bc42b0650c48504a286020dcda85180e05e2 (diff)
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
Diffstat (limited to 'lib/easy.c')
-rw-r--r--lib/easy.c8
1 files changed, 6 insertions, 2 deletions
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;