diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2018-11-24 23:20:19 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-11-25 11:25:43 +0100 |
| commit | 34fe0e1622fd87f2945e734787bc29e314d253cc (patch) | |
| tree | 016430aca52221cb38fd34fc2c0722a4eef062ab /lib/easy.c | |
| parent | ae7a09db20081672242cbf69bb871f3ab1c5a24c (diff) | |
| download | curl-34fe0e1622fd87f2945e734787bc29e314d253cc.tar.gz | |
curl_easy_perform: fix timeout handling
curl_multi_wait() was erroneously used from within
curl_easy_perform(). It could lead to it believing there was no socket
to wait for and then instead sleep for a while instead of monitoring the
socket and then miss acting on that activity as swiftly as it should
(causing an up to 1000 ms delay).
Reported-by: Antoni Villalonga
Fixes #3305
Closes #3306
Closes #3308
Diffstat (limited to 'lib/easy.c')
| -rw-r--r-- | lib/easy.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/easy.c b/lib/easy.c index d940b5d3e..e592d7a71 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -664,12 +664,12 @@ static CURLcode easy_transfer(struct Curl_multi *multi) while(!done && !mcode) { int still_running = 0; - int rc; + bool gotsocket = FALSE; - mcode = curl_multi_wait(multi, NULL, 0, 1000, &rc); + mcode = Curl_multi_wait(multi, NULL, 0, 1000, NULL, &gotsocket); if(!mcode) { - if(!rc) { + if(!gotsocket) { long sleep_ms; /* If it returns without any filedescriptor instantly, we need to @@ -688,6 +688,7 @@ static CURLcode easy_transfer(struct Curl_multi *multi) /* only read 'still_running' if curl_multi_perform() return OK */ if(!mcode && !still_running) { + int rc; CURLMsg *msg = curl_multi_info_read(multi, &rc); if(msg) { result = msg->data.result; |