aboutsummaryrefslogtreecommitdiff
path: root/lib/multi.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2011-09-30 22:59:50 +0200
committerDaniel Stenberg <daniel@haxx.se>2011-09-30 22:59:50 +0200
commit3d19e1eedf73f48e03c68b8ff7e8a7ad178345ad (patch)
tree6c4cac254aeea3090c561a865376e53bf4c455f5 /lib/multi.c
parent7be872c389a4cc97a4594912d1e0bdd865974780 (diff)
multi_runsingle: change state on callback abort
Reported by: Marcin Adamski Bug: http://curl.haxx.se/mail/lib-2011-09/0329.html
Diffstat (limited to 'lib/multi.c')
-rw-r--r--lib/multi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/multi.c b/lib/multi.c
index 9cc6944c9..d2c94590e 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -1656,8 +1656,10 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
multistate(easy, CURLM_STATE_COMPLETED);
}
/* if there's still a connection to use, call the progress function */
- else if(easy->easy_conn && Curl_pgrsUpdate(easy->easy_conn))
+ else if(easy->easy_conn && Curl_pgrsUpdate(easy->easy_conn)) {
easy->result = CURLE_ABORTED_BY_CALLBACK;
+ multistate(easy, CURLM_STATE_COMPLETED);
+ }
}
} WHILE_FALSE; /* just to break out from! */