121 lines
4.0 KiB
Diff
121 lines
4.0 KiB
Diff
From 34fe0e1622fd87f2945e734787bc29e314d253cc Mon Sep 17 00:00:00 2001
|
|
From: Daniel Stenberg <daniel@haxx.se>
|
|
Date: Sat, 24 Nov 2018 23:20:19 +0100
|
|
Subject: [PATCH 314/557] 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
|
|
---
|
|
lib/easy.c | 7 ++++---
|
|
lib/multi.c | 20 ++++++++++++++++++--
|
|
lib/multiif.h | 8 ++++++++
|
|
3 files changed, 30 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/lib/easy.c b/lib/easy.c
|
|
index d940b5d..e592d7a 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;
|
|
diff --git a/lib/multi.c b/lib/multi.c
|
|
index c2ef6c1..cca1380 100644
|
|
--- a/lib/multi.c
|
|
+++ b/lib/multi.c
|
|
@@ -985,11 +985,12 @@ CURLMcode curl_multi_fdset(struct Curl_multi *multi,
|
|
|
|
#define NUM_POLLS_ON_STACK 10
|
|
|
|
-CURLMcode curl_multi_wait(struct Curl_multi *multi,
|
|
+CURLMcode Curl_multi_wait(struct Curl_multi *multi,
|
|
struct curl_waitfd extra_fds[],
|
|
unsigned int extra_nfds,
|
|
int timeout_ms,
|
|
- int *ret)
|
|
+ int *ret,
|
|
+ bool *gotsocket) /* if any socket was checked */
|
|
{
|
|
struct Curl_easy *data;
|
|
curl_socket_t sockbunch[MAX_SOCKSPEREASYHANDLE];
|
|
@@ -1003,6 +1004,9 @@ CURLMcode curl_multi_wait(struct Curl_multi *multi,
|
|
int retcode = 0;
|
|
struct pollfd a_few_on_stack[NUM_POLLS_ON_STACK];
|
|
|
|
+ if(gotsocket)
|
|
+ *gotsocket = FALSE;
|
|
+
|
|
if(!GOOD_MULTI_HANDLE(multi))
|
|
return CURLM_BAD_HANDLE;
|
|
|
|
@@ -1135,9 +1139,21 @@ CURLMcode curl_multi_wait(struct Curl_multi *multi,
|
|
free(ufds);
|
|
if(ret)
|
|
*ret = retcode;
|
|
+ if(gotsocket && (extra_fds || curlfds))
|
|
+ /* if any socket was checked */
|
|
+ *gotsocket = TRUE;
|
|
+
|
|
return CURLM_OK;
|
|
}
|
|
|
|
+CURLMcode curl_multi_wait(struct Curl_multi *multi,
|
|
+ struct curl_waitfd extra_fds[],
|
|
+ unsigned int extra_nfds,
|
|
+ int timeout_ms,
|
|
+ int *ret)
|
|
+{
|
|
+ return Curl_multi_wait(multi, extra_fds, extra_nfds, timeout_ms, ret, NULL);
|
|
+}
|
|
/*
|
|
* Curl_multi_connchanged() is called to tell that there is a connection in
|
|
* this multi handle that has changed state (pipelining become possible, the
|
|
diff --git a/lib/multiif.h b/lib/multiif.h
|
|
index c50063d..e44646b 100644
|
|
--- a/lib/multiif.h
|
|
+++ b/lib/multiif.h
|
|
@@ -97,4 +97,12 @@ void Curl_multi_closed(struct Curl_easy *data, curl_socket_t s);
|
|
CURLMcode Curl_multi_add_perform(struct Curl_multi *multi,
|
|
struct Curl_easy *data,
|
|
struct connectdata *conn);
|
|
+
|
|
+CURLMcode Curl_multi_wait(struct Curl_multi *multi,
|
|
+ struct curl_waitfd extra_fds[],
|
|
+ unsigned int extra_nfds,
|
|
+ int timeout_ms,
|
|
+ int *ret,
|
|
+ bool *gotsocket); /* if any socket was checked */
|
|
+
|
|
#endif /* HEADER_CURL_MULTIIF_H */
|
|
--
|
|
1.8.3.1
|
|
|