From 3d19e1eedf73f48e03c68b8ff7e8a7ad178345ad Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 30 Sep 2011 22:59:50 +0200
Subject: multi_runsingle: change state on callback abort

Reported by: Marcin Adamski
Bug: http://curl.haxx.se/mail/lib-2011-09/0329.html
---
 lib/multi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib')

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! */
 
-- 
cgit v1.2.3