MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix podcast download issues

Browse Source 
Some podcast feeds use circular redirects (with query parameters).
Fixes #1013
Avoids HttpClient cookie handling producing "Invalid cookie" errors due to
not handling latest "expires" attribute formats.
This commit is contained in:
Evan Harris
2019-07-24 23:30:40 -05:00
parent d256386cbb
commit 093f7c028d
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
airsonic-main/src/main/java/org/airsonic/player/service/PodcastService.java
+5
View File
@@ -36,6 +36,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.http.Header; import org.apache.http.Header;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.client.config.CookieSpecs;
import org.apache.http.client.config.RequestConfig; import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
@@ -551,6 +552,10 @@ public class PodcastService {
RequestConfig requestConfig = RequestConfig.custom() RequestConfig requestConfig = RequestConfig.custom()
.setConnectTimeout(2 * 60 * 1000) // 2 minutes .setConnectTimeout(2 * 60 * 1000) // 2 minutes
.setSocketTimeout(10 * 60 * 1000) // 10 minutes .setSocketTimeout(10 * 60 * 1000) // 10 minutes
// Workaround HttpClient circular redirects, which some feeds use (with query parameters)
.setCircularRedirectsAllowed(true)
// Workaround HttpClient not understanding latest RFC-compliant cookie 'expires' attributes
.setCookieSpec(CookieSpecs.STANDARD)
.build(); .build();
HttpGet method = new HttpGet(episode.getUrl()); HttpGet method = new HttpGet(episode.getUrl());
method.setConfig(requestConfig); method.setConfig(requestConfig);