aboutsummaryrefslogtreecommitdiff
path: root/lib/multi.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2006-08-31 12:53:39 +0000
committerDaniel Stenberg <daniel@haxx.se>2006-08-31 12:53:39 +0000
commitd7168a82e2123b6c3eb4db8e890ce7c14e21b32a (patch)
treed54f793ce363d67cff2cae2dd5f2d9270d38a57f /lib/multi.c
parentc9c8ee3796dc2ab71a04c9b5bfb23dd98b47ddf5 (diff)
Dmitriy Sergeyev found and fixed a multi interface flaw when using asynch
name resolves. It could get stuck in the wrong state.
Diffstat (limited to 'lib/multi.c')
-rw-r--r--lib/multi.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/multi.c b/lib/multi.c
index c1ff12e29..01891b5dd 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -639,8 +639,12 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
is already freed and gone */
easy->easy_conn = NULL; /* no more connection */
else {
- /* FIX: what if protocol_connect is TRUE here?! */
- multistate(easy, CURLM_STATE_WAITCONNECT);
+ /* call again please so that we get the next socket setup */
+ result = CURLM_CALL_MULTI_PERFORM;
+ if(protocol_connect)
+ multistate(easy, CURLM_STATE_DO);
+ else
+ multistate(easy, CURLM_STATE_WAITCONNECT);
}
}