From patchwork Sat Oct 17 15:17:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?6JSh5piK5Yed?= X-Patchwork-Id: 23038 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 750C944B953 for ; Sat, 17 Oct 2020 18:18:07 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 530F668B8C3; Sat, 17 Oct 2020 18:18:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3BE7068B84A for ; Sat, 17 Oct 2020 18:18:00 +0300 (EEST) Received: by mail-pj1-f65.google.com with SMTP id j8so3109387pjy.5 for ; Sat, 17 Oct 2020 08:18:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Dfsocy/voD3qlzULcNRrI6UhpKMAAEz/Fbrn5AGtlMY=; b=NJ7mtL9GTCHT3BFgCmXCcfcclrUWNVuPdL/ur5W09X89eKK2HVRlZchM0jwpYV8K6l i9Xv6TTAPg7w9ulde02hVu33aA2zW6BJVqgf+VhNtpFqiRx4Bv1JW++4Ou08DcBwnG4j eI5ZJYWxAhLsP6zqIQ8eXtjQSz5qDcy6BKNdqWa504NMmxv1qMV88URdI0LK3IP2Op4R uMBBF/ibbM5cSc0DvjFdx1fzjGepsznw8CCY9r8ehdHbtU+sYRPpvZtUU7IBKU9vLN7V Lwv+lpEu9jRe0Ga1wPR6Dkw482/0hoGfx85AFfOP8edvHe/uGXw0ifz8qvj3YM23wT4/ j5PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Dfsocy/voD3qlzULcNRrI6UhpKMAAEz/Fbrn5AGtlMY=; b=jsYdlFtse0JjZ7eQ2ZrMD17L83uX+G12aVWtmY9pX2xXbEVs4FXu5AhD8tuOAFE716 3fT2WxrjS/2JBhz6Kh0b8qawFHp7FeFtIAZQ75ZW2fye0MSfdzdIPdH7z+HTzqQnf/21 b2utcovYF+sroX1BYiumdVRWiNWjj0g/b4ORhOvawip8ANFqFTITnmtztmeAhxHybCJq Tn/0oarOLLnG+F844HWOvtKTg6rU+s8fDUdaoLaRmuJ6GFz+bkN4tp4ZV0F8JTvw2qpe yYsAMVdp4nl3wgmqZktWLWg3898Emg5U2oDxc0bVtJyBzJb1Iw5pA+rUACXKeOuteABx a2Hg== X-Gm-Message-State: AOAM533/TLcVXKR3Tv9bOG8fjMmPE07D7HDDV1/aaFqveG1FT/vSkhzZ J84LeN7l2NxAKzYbxE7t21wenRLZJTKG1Q== X-Google-Smtp-Source: ABdhPJx5cnH20ZgEJbWXRKzQJN7E28a1KKbXeKnl76MIQ1cQinBo22/t35fLL3F0WShVac8r1qIfBQ== X-Received: by 2002:a17:90a:c68e:: with SMTP id n14mr9601354pjt.158.1602947878422; Sat, 17 Oct 2020 08:17:58 -0700 (PDT) Received: from localhost.localdomain ([113.65.228.192]) by smtp.gmail.com with ESMTPSA id z30sm6458273pfq.87.2020.10.17.08.17.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Oct 2020 08:17:57 -0700 (PDT) From: caihaoning83@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Oct 2020 23:17:14 +0800 Message-Id: <20201017151714.44216-1-caihaoning83@gmail.com> X-Mailer: git-send-email 2.24.1 (Apple Git-126) MIME-Version: 1.0 Subject: [FFmpeg-devel] =?utf-8?q?=5BPATCH_v3=5D_lavf/url=3A_fix_rel_path?= =?utf-8?q?=E2=80=99s_query_string_contains_=3A/?= X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: "ruiquan.crq" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: "ruiquan.crq" Signed-off-by: ruiquan.crq --- libavformat/tests/url.c | 2 ++ libavformat/url.c | 2 +- tests/ref/fate/url | 8 ++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libavformat/tests/url.c b/libavformat/tests/url.c index 2440ae08bc..2eb597bb5e 100644 --- a/libavformat/tests/url.c +++ b/libavformat/tests/url.c @@ -90,6 +90,8 @@ int main(void) test_decompose("http://[::1]/dev/null"); test_decompose("http://[::1]:8080/dev/null"); test_decompose("//ffmpeg/dev/null"); + test_decompose("test?url=http://server/path"); + test_decompose("dummy.mp4#t=0:02:00,121.5"); printf("Testing ff_make_absolute_url:\n"); test(NULL, "baz"); diff --git a/libavformat/url.c b/libavformat/url.c index 3c858f0257..6db4b4e1ae 100644 --- a/libavformat/url.c +++ b/libavformat/url.c @@ -97,7 +97,7 @@ int ff_url_decompose(URLComponents *uc, const char *url, const char *end) /* scheme */ uc->scheme = cur; - p = find_delim(":/", cur, end); /* lavf "schemes" can contain options */ + p = find_delim(":/?#", cur, end); /* lavf "schemes" can contain options but not some RFC 3986 delimiters */ if (*p == ':') cur = p + 1; diff --git a/tests/ref/fate/url b/tests/ref/fate/url index 7e6395c47b..08e80def7d 100644 --- a/tests/ref/fate/url +++ b/tests/ref/fate/url @@ -43,6 +43,14 @@ http://[::1]:8080/dev/null => host: ffmpeg path: /dev/null +test?url=http://server/path => + path: test + query: ?url=http://server/path + +dummy.mp4#t=0:02:00,121.5 => + path: dummy.mp4 + fragment: #t=0:02:00,121.5 + Testing ff_make_absolute_url: (null) baz => baz /foo/bar baz => /foo/baz