Make direct SHOUTcast streams work again
Might be an issue specific to my bbc-on-ice, since we're not asking for SHOUTcast by including "Icy-MetaData: 1" in request headers but the proxy always outputs an "ICY 200 OK" header.
This commit is contained in:
parent
7af041ac01
commit
8707b38c48
4
nncmpp.c
4
nncmpp.c
|
@ -2970,6 +2970,8 @@ streams_tab_process (const char *uri, bool replace, struct error **e)
|
||||||
task.replace = replace;
|
task.replace = replace;
|
||||||
bool result = false;
|
bool result = false;
|
||||||
|
|
||||||
|
struct curl_slist *ok_headers = curl_slist_append (NULL, "ICY 200 OK");
|
||||||
|
|
||||||
CURLcode res;
|
CURLcode res;
|
||||||
if ((res = curl_easy_setopt (easy, CURLOPT_FOLLOWLOCATION, 1L))
|
if ((res = curl_easy_setopt (easy, CURLOPT_FOLLOWLOCATION, 1L))
|
||||||
|| (res = curl_easy_setopt (easy, CURLOPT_NOPROGRESS, 1L))
|
|| (res = curl_easy_setopt (easy, CURLOPT_NOPROGRESS, 1L))
|
||||||
|
@ -2979,6 +2981,7 @@ streams_tab_process (const char *uri, bool replace, struct error **e)
|
||||||
|| (res = curl_easy_setopt (easy, CURLOPT_SSL_VERIFYPEER, 0L))
|
|| (res = curl_easy_setopt (easy, CURLOPT_SSL_VERIFYPEER, 0L))
|
||||||
|| (res = curl_easy_setopt (easy, CURLOPT_SSL_VERIFYHOST, 0L))
|
|| (res = curl_easy_setopt (easy, CURLOPT_SSL_VERIFYHOST, 0L))
|
||||||
|| (res = curl_easy_setopt (easy, CURLOPT_URL, uri))
|
|| (res = curl_easy_setopt (easy, CURLOPT_URL, uri))
|
||||||
|
|| (res = curl_easy_setopt (easy, CURLOPT_HTTP200ALIASES, ok_headers))
|
||||||
|
|
||||||
|| (res = curl_easy_setopt (easy, CURLOPT_VERBOSE, (long) g_debug_mode))
|
|| (res = curl_easy_setopt (easy, CURLOPT_VERBOSE, (long) g_debug_mode))
|
||||||
|| (res = curl_easy_setopt (easy, CURLOPT_DEBUGFUNCTION, print_curl_debug))
|
|| (res = curl_easy_setopt (easy, CURLOPT_DEBUGFUNCTION, print_curl_debug))
|
||||||
|
@ -3002,6 +3005,7 @@ streams_tab_process (const char *uri, bool replace, struct error **e)
|
||||||
|
|
||||||
error:
|
error:
|
||||||
curl_easy_cleanup (task.curl.easy);
|
curl_easy_cleanup (task.curl.easy);
|
||||||
|
curl_slist_free_all (ok_headers);
|
||||||
str_free (&task.data);
|
str_free (&task.data);
|
||||||
poller_curl_free (&pc);
|
poller_curl_free (&pc);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue