input_curl: always set eof=true on CURLMSG_DONE

curl_multi_info_read() is the authoritative source of the "end-of-response" information. Always set c->eof when a CURLMSG_DONE message is received, and check the result (success/failure) after that.

input_curl: always set eof=true on CURLMSG_DONE
f61904db · Max Kellermann · 90bfe65e · f61904db
Commit f61904db authored Nov 20, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

input_curl.c src/input_curl.c +7 -5

No files found.
--- a/src/input_curl.c
+++ b/src/input_curl.c
@@ -155,12 +155,14 @@ input_curl_multi_info_read(struct input_stream *is)

 	while ((msg = curl_multi_info_read(c->multi,
 					   &msgs_in_queue)) != NULL) {
-		if (msg->msg == CURLMSG_DONE &&
-		    msg->data.result != CURLE_OK) {
-			g_warning("curl failed: %s\n", c->error);
-			is->error = -1;
+		if (msg->msg == CURLMSG_DONE) {
 			c->eof = true;
-			return false;
+
+			if (msg->data.result != CURLE_OK) {
+				g_warning("curl failed: %s\n", c->error);
+				is->error = -1;
+				return false;
+			}
 		}
 	}