MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-27 05:19:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

[http] Let the curl https client follow up to 5 redirects

Browse Source 
Requests for artwork to Cover Art Archive require redirects. Perhaps there are
also some playlist requests that will benefit from this.
This commit is contained in:
ejurgensen 2020-02-11 14:15:23 +01:00
parent 937f4431f8
commit 15b18e26b7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/http.c
View File

@ -386,10 +386,13 @@ https_client_request_impl(struct http_client_ctx *ctx)
curl_easy_setopt(curl, CURLOPT_POSTFIELDS, ctx->output_body); curl_easy_setopt(curl, CURLOPT_POSTFIELDS, ctx->output_body);
curl_easy_setopt(curl, CURLOPT_TIMEOUT, HTTP_CLIENT_TIMEOUT); curl_easy_setopt(curl, CURLOPT_TIMEOUT, HTTP_CLIENT_TIMEOUT);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_request_cb); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_request_cb);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, ctx); curl_easy_setopt(curl, CURLOPT_WRITEDATA, ctx);
// Artwork and playlist requests might require redirects
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 5);
/* Make request */ /* Make request */
DPRINTF(E_INFO, L_HTTP, "Making request for %s\n", ctx->url); DPRINTF(E_INFO, L_HTTP, "Making request for %s\n", ctx->url);
@ -416,7 +419,6 @@ http_client_request(struct http_client_ctx *ctx)
{ {
if (strncmp(ctx->url, "http:", strlen("http:")) == 0) if (strncmp(ctx->url, "http:", strlen("http:")) == 0)
return http_client_request_impl(ctx); return http_client_request_impl(ctx);
#ifdef HAVE_LIBCURL #ifdef HAVE_LIBCURL
if (strncmp(ctx->url, "https:", strlen("https:")) == 0) if (strncmp(ctx->url, "https:", strlen("https:")) == 0)
return https_client_request_impl(ctx); return https_client_request_impl(ctx);