wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avformat/http: Ensure same protocol in ff_http_do_new_request2

Browse source 
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@tencent.com>
This commit is contained in:
Zhao Zhili 2025-04-23 20:59:49 +08:00
parent bb0c4649fb
commit 9187f40e92
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libavformat/http.c
View file

@ -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, av_url_split(proto2, sizeof(proto2), NULL, 0,
hostname2, sizeof(hostname2), &port2, hostname2, sizeof(hostname2), &port2,
NULL, 0, uri); 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) { 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, hostname1, port1,
hostname2, port2 hostname2, port2
); );