curl: don't check running_handles for EOF

Since we are using curl_multi_info_read() / CURLMSG_DONE for detecting end-of-response, we can remove all running_handles==0 checks. For some reason, that has never worked correctly.

curl: don't check running_handles for EOF
a0dd5b7f · Max Kellermann · f61904db · a0dd5b7f
Commit a0dd5b7f authored Nov 20, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 7 deletions

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

No files found.
--- a/src/input_curl.c
+++ b/src/input_curl.c
@@ -268,8 +268,6 @@ input_curl_read(struct input_stream *is, void *ptr, size_t size)
 		bret = input_curl_multi_info_read(is);
 		if (!bret)
 			return 0;
-
-		c->eof = running_handles == 0;
 	}

 	/* send buffer contents */
@@ -347,8 +345,6 @@ input_curl_buffer(struct input_stream *is)
 	if (!ret)
 		return -1;

-	c->eof = running_handles == 0;
-
 	return c->buffered;
 }

@@ -482,8 +478,6 @@ input_curl_send_request(struct input_curl *c)
 		mcode = curl_multi_perform(c->multi, &running_handles);
 	} while (mcode == CURLM_CALL_MULTI_PERFORM);

-	c->eof = running_handles == 0;
-
 	if (mcode != CURLM_OK) {
 		g_warning("curl_multi_perform() failed: %s\n",
 			  curl_multi_strerror(mcode));
@@ -616,7 +610,7 @@ input_curl_seek(struct input_stream *is, off_t offset, int whence)
 	if (!ret)
 		return false;

-	return true;
+	return input_curl_multi_info_read(is);
 }

 static bool