diff options
author | Max Kellermann <max@duempel.org> | 2011-09-01 19:19:42 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2011-09-01 19:19:42 +0200 |
commit | 6a3008d7ff787164124a43911145f7305c66aa7e (patch) | |
tree | 54090ac05037c9ba4c7536747462469744bb2531 /src/input/curl_input_plugin.c | |
parent | 140162191388063e41e33b53d4533e07529df870 (diff) | |
parent | 2556449b361c00d9c66cf85beb64d7c6458763ed (diff) | |
download | mpd-6a3008d7ff787164124a43911145f7305c66aa7e.tar.gz mpd-6a3008d7ff787164124a43911145f7305c66aa7e.tar.xz mpd-6a3008d7ff787164124a43911145f7305c66aa7e.zip |
Merge branch 'v0.16.x'
Conflicts:
configure.ac
src/output_control.c
Diffstat (limited to '')
-rw-r--r-- | src/input/curl_input_plugin.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/input/curl_input_plugin.c b/src/input/curl_input_plugin.c index 54c6d2f18..a591c9272 100644 --- a/src/input/curl_input_plugin.c +++ b/src/input/curl_input_plugin.c @@ -1124,6 +1124,9 @@ input_curl_easy_init(struct input_curl *c, GError **error_r) curl_easy_setopt(c->easy, CURLOPT_MAXREDIRS, 5); curl_easy_setopt(c->easy, CURLOPT_FAILONERROR, true); curl_easy_setopt(c->easy, CURLOPT_ERRORBUFFER, c->error); + curl_easy_setopt(c->easy, CURLOPT_NOPROGRESS, 1l); + curl_easy_setopt(c->easy, CURLOPT_NOSIGNAL, 1l); + curl_easy_setopt(c->easy, CURLOPT_CONNECTTIMEOUT, 10l); if (proxy != NULL) curl_easy_setopt(c->easy, CURLOPT_PROXY, proxy); |