aboutsummaryrefslogtreecommitdiff
path: root/lib/easy.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-05-09 12:47:49 +0200
committerDaniel Stenberg <daniel@haxx.se>2017-05-10 12:55:36 +0200
commit31b39c40cf909d34f27dc655755f346482f57089 (patch)
tree4fcf5799aebdf1573b6789f1a19ef3ac8aa0e279 /lib/easy.c
parente9fd794a616c10bd0d017a76f8fdccaf4cc76851 (diff)
multi: use a fixed array of timers instead of malloc
... since the total amount is low this is faster, easier and reduces memory overhead. Also, Curl_expire_done() can now mark an expire timeout as done so that it never times out. Closes #1472
Diffstat (limited to 'lib/easy.c')
-rw-r--r--lib/easy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/easy.c b/lib/easy.c
index d4add46cc..46c0a9911 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -1044,7 +1044,7 @@ CURLcode curl_easy_pause(struct Curl_easy *data, int action)
if(!result &&
((newstate&(KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) !=
(KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) )
- Curl_expire(data, 0, EXPIRE_UNPAUSE); /* get this handle going again */
+ Curl_expire(data, 0, EXPIRE_RUN_NOW); /* get this handle going again */
return result;
}