diff --git a/CHANGELOG.md b/CHANGELOG.md index 0883d084..fc5de480 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ * Added Amateur.TV * Added XloveCam * Improved Chaturbate search +* Fixed problem with MFC segment downloads by restricting MFC to HTTP/1.1 * Fixed tipping function * Fixed bug in recording precondition check, which caused recordings to get restarted. The bug occured when model groups were used in combination with diff --git a/common/src/main/java/ctbrec/recorder/download/hls/SegmentDownload.java b/common/src/main/java/ctbrec/recorder/download/hls/SegmentDownload.java index 1b512ec3..5709130b 100644 --- a/common/src/main/java/ctbrec/recorder/download/hls/SegmentDownload.java +++ b/common/src/main/java/ctbrec/recorder/download/hls/SegmentDownload.java @@ -62,7 +62,7 @@ public class SegmentDownload implements Callable { if (tries == 3) { LOG.warn("Error while downloading segment for {}. Segment {} finally failed: {}", model, url.getFile(), e.getMessage()); } else { - LOG.debug("Error while downloading segment for {} on try {} - {}", model, tries, e.getMessage()); + LOG.debug("Error while downloading segment {} for {} on try {} - {}", url.getFile(), model, tries, e.getMessage()); } } } diff --git a/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java b/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java index 4834b078..59673e8c 100644 --- a/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java +++ b/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java @@ -640,7 +640,7 @@ public class MyFreeCamsClient { String phasePrefix = phase.equals("z") ? "" : '_' + phase; String server = "video" + getCamServ(state).replaceAll("^\\D+", ""); String nonce = Double.toString(Math.random()); - String streamUrl = HTTPS + server + ".myfreecams.com/NxServer/ngrp:mfc" + phasePrefix + '_' + userChannel + ".f4v_mobile/playlist.m3u8?nc=" + nonce; + String streamUrl = HTTPS + server + ".myfreecams.com/NxServer/ngrp:mfc" + phasePrefix + '_' + userChannel + ".f4v_mobile/playlist.m3u8?nc=" + nonce + "&v=1.96"; return streamUrl; } diff --git a/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsHttpClient.java b/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsHttpClient.java index faa9092a..27bb8c97 100644 --- a/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsHttpClient.java +++ b/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsHttpClient.java @@ -3,6 +3,7 @@ package ctbrec.sites.mfc; import static ctbrec.io.HttpConstants.*; import java.io.IOException; +import java.util.Arrays; import java.util.List; import java.util.Locale; import java.util.NoSuchElementException; @@ -20,6 +21,7 @@ import okhttp3.Cookie; import okhttp3.CookieJar; import okhttp3.FormBody; import okhttp3.HttpUrl; +import okhttp3.Protocol; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; @@ -32,6 +34,9 @@ public class MyFreeCamsHttpClient extends HttpClient { public MyFreeCamsHttpClient() { super("myfreecams"); + client = client.newBuilder() + .protocols(Arrays.asList(Protocol.HTTP_1_1)) + .build(); } @Override diff --git a/server/.classpath b/server/.classpath index cbb4c58f..bfd5447a 100644 --- a/server/.classpath +++ b/server/.classpath @@ -5,6 +5,7 @@ +