From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 31212494F0
for <ffmpegdev@gitmailbox.com>; Wed, 23 Apr 2025 13:00:31 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E0568687DDC;
Wed, 23 Apr 2025 16:00:08 +0300 (EEST)
Received: from out162-62-57-137.mail.qq.com (out162-62-57-137.mail.qq.com
[162.62.57.137])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B47A6687DD2
for <ffmpeg-devel@ffmpeg.org>; Wed, 23 Apr 2025 16:00:01 +0300 (EEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com;
s=s201512; t=1745413191;
bh=KLPByYAjI/7PTnMxwUDCQtQpC3IO7yp0aV432ok3Jic=;
h=From:To:Cc:Subject:Date;
b=UJzxta64o4A/s9uQn4VgJBz1ViK1SdmqoNX+TvXn12cNG4e92ptFXBMu5SsyqNj5a
zaGmH9B3UurkfBry+KDJYaWrc2NaJCfVAXgW8DvunvFlZWu4qmQ+nBD/mqvKeYYrT7
25NukS5uqObHFV9rPKSojCS3ZyK68aLQzRHgggZo=
Received: from localhost.localdomain ([119.147.10.242])
by newxmesmtplogicsvrszb20-0.qq.com (NewEsmtp) with SMTP
id EF22120D; Wed, 23 Apr 2025 20:59:50 +0800
X-QQ-mid: xmsmtpt1745413190tx61ddwae
Message-ID: <tencent_DC1302A84B33F8336A15C689196EA5254205@qq.com>
X-QQ-XMAILINFO: NGZp1yYNf7Y+hL+77wVaWrPZEguuo8FC01HMlOYzc52lEyuajiZafrE4xKt2Sx
JLJ25BJGe/hUHLMM214UFD0tSn5I+gun/xKqTyu8yacN6wYfvuhV27cZRHQHv3qXsqR45SUmSGGR
Mk2fGRfB95p9ZY99uZ5APYs435vgQnKDPmDuhjyRH8J5SSaoPQ2gDPZmvIgcxML43QIZQFcxoi9w
1btP5jotJaFMCAL+HzXqhNTLZ+siFW0jn8P0D9eVhQL/6UGJHMZ5kTbr0dryBAnn0fvCZ0aMxjw0
cVfVgP6kBCbX5ggsN80r70997jguYUO09/OiebDethl0jC4y77ImbaRgEEj6+MYVLI0uWAbmdafz
xTD5t1BSKmtnIU5HbD49FBlIeIzAlcLvYc096xCPcTQULV80zo71sZfg7Onvksl0QVj/8fXm39RH
vVHc5gWIJkR9QsKt4P3UocxC9dmdU/+9lU1vqAmlrpKBv+E/PNLMhK+zXfEhCwaQPwRexVph6lD+
3zEc9H2gX6eDU5D4hhZ8W7ZQyHoLfYVPrKmLj/tRykxre91gXRtKOvPvLoenekBoyBMQbWXwgd73
autHB/AGDVnK5dmSk64sGz6aiIppJHNPKx+xjkIRxpuK1PlJQlcfTPvnleeWFWWuOK9XKNLWyr4L
+bon9L/vHUBqu0BH8hsTMVcH1QXmQcPuuAZwjHLyC4WURhv+o/Z7/l+fSCt6nWhgMflTGlAqBkqM
CoGBKM57ENubfVsxdaTe1SmhfPS84N1M553Z3vZY8XWsFq4nQIlUtxyNlSuqP59ULfHFAGelwU6X
pa0JoAN66HqNk85omRv7noJEkf7KzSPVItM+vbHwjqQLnvUszRD3nulbhpcIiN7I6yNcfOJReqC7
E39JSTjAZm++UbaC07Rj1dO40PGcvqDys62XhVx/7qLUdykXS04m3GcKdoUYrB5Na8sV8dIZhO7f
R4nUxcLAk91I7708zGlh+XUDB9lUGpK0fkhBXCIyYvU8sNjQSEXki9viwnxy0Lg7QGB/FP/LCQSU
86wAQ3htz06Hc3IkT4Wos8fbQwGyY=
X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU=
From: Zhao Zhili <quinkblack-at-foxmail.com@ffmpeg.org>
To: ffmpeg-devel@ffmpeg.org
Date: Wed, 23 Apr 2025 20:59:49 +0800
X-OQ-MSGID: <20250423125949.73725-1-quinkblack@foxmail.com>
X-Mailer: git-send-email 2.46.0
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH 3/3] avformat/http: Ensure same protocol in
ff_http_do_new_request2
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Zhao Zhili <zhilizhao@tencent.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/tencent_DC1302A84B33F8336A15C689196EA5254205@qq.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
From: Zhao Zhili <zhilizhao@tencent.com>
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.
---
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
);
--
2.46.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".