[FFmpeg-cvslog] avformat/http: Ensure same protocol in ff_http_do_new_request2
Zhao Zhili
git at videolan.org
Tue Apr 29 10:35:00 EEST 2025
ffmpeg | branch: master | Zhao Zhili <zhilizhao at tencent.com> | Wed Apr 23 20:59:49 2025 +0800| [9187f40e921d5eab8728ffba8e200cfe66e3c008] | committer: Zhao Zhili
avformat/http: Ensure same protocol in ff_http_do_new_request2
This can happen for HLS with AES-128 at the middle of m3u8, so old
protocol is https while new protocol is crypt+https.
And change the log level from ERROR to INFO when protocol/host/port
don't match. User should prepared for this function to fail and
retry with new connection.
Signed-off-by: Zhao Zhili <zhilizhao at tencent.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9187f40e921d5eab8728ffba8e200cfe66e3c008
---
libavformat/http.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/libavformat/http.c b/libavformat/http.c
index 65ea5d993c..f7b2a8a029 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -498,8 +498,13 @@ int ff_http_do_new_request2(URLContext *h, const char *uri, AVDictionary **opts)
av_url_split(proto2, sizeof(proto2), NULL, 0,
hostname2, sizeof(hostname2), &port2,
NULL, 0, uri);
+ if (strcmp(proto1, proto2) != 0) {
+ av_log(h, AV_LOG_INFO, "Cannot reuse HTTP connection for different protocol %s vs %s\n",
+ proto1, proto2);
+ return AVERROR(EINVAL);
+ }
if (port1 != port2 || strncmp(hostname1, hostname2, sizeof(hostname2)) != 0) {
- av_log(h, AV_LOG_ERROR, "Cannot reuse HTTP connection for different host: %s:%d != %s:%d\n",
+ av_log(h, AV_LOG_INFO, "Cannot reuse HTTP connection for different host: %s:%d != %s:%d\n",
hostname1, port1,
hostname2, port2
);
More information about the ffmpeg-cvslog
mailing list