oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

curl: don't check running_handles for EOF

Browse Source 
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.
This commit is contained in:
Max Kellermann 2008-11-20 12:42:42 +01:00
parent f61904db33
commit a0dd5b7f2f
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/input_curl.c
View File

@ -268,8 +268,6 @@ input_curl_read(struct input_stream *is, void *ptr, size_t size)
bret = input_curl_multi_info_read(is); bret = input_curl_multi_info_read(is);
if (!bret) if (!bret)
return 0; return 0;
c->eof = running_handles == 0;
} }
/* send buffer contents */ /* send buffer contents */
@ -347,8 +345,6 @@ input_curl_buffer(struct input_stream *is)
if (!ret) if (!ret)
return -1; return -1;
c->eof = running_handles == 0;
return c->buffered; return c->buffered;
} }
@ -482,8 +478,6 @@ input_curl_send_request(struct input_curl *c)
mcode = curl_multi_perform(c->multi, &running_handles); mcode = curl_multi_perform(c->multi, &running_handles);
} while (mcode == CURLM_CALL_MULTI_PERFORM); } while (mcode == CURLM_CALL_MULTI_PERFORM);
c->eof = running_handles == 0;
if (mcode != CURLM_OK) { if (mcode != CURLM_OK) {
g_warning("curl_multi_perform() failed: %s\n", g_warning("curl_multi_perform() failed: %s\n",
curl_multi_strerror(mcode)); curl_multi_strerror(mcode));
@ -616,7 +610,7 @@ input_curl_seek(struct input_stream *is, off_t offset, int whence)
if (!ret) if (!ret)
return false; return false;
return true; return input_curl_multi_info_read(is);
} }
static bool static bool