From patchwork Mon Apr 15 16:27:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 48072 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:670b:b0:1a9:af23:56c1 with SMTP id wh11csp1953341pzb; Mon, 15 Apr 2024 09:28:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUGgUc1bdEOFdiYi6wXJgka2EMPmX+IEPVp9Nq8kIUMSF939Frg0JT4LMkWDGp3F8UFGci1uW4A455zaR780FZlRvaKMPjehlxexQ== X-Google-Smtp-Source: AGHT+IHZDLfdlv+QsWny5MOwHn8eMJ354MLv7vGLKbCdNG+KXQlJ2tljhArPrShuiOP3d0XHbFLY X-Received: by 2002:a50:baae:0:b0:570:33b0:ac32 with SMTP id x43-20020a50baae000000b0057033b0ac32mr1366743ede.0.1713198519734; Mon, 15 Apr 2024 09:28:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713198519; cv=none; d=google.com; s=arc-20160816; b=tHYbf/V7JT1FHPWzzdyA9CTN1YuxvjZxFWd6Hn/93ip3Qfn7+Gkb3ETMqfjTX8oGsy qAovvwtSy9mh0o8iKNRJGYbo1o5Qw922B0WUssue6ECLGw39li9Na2+3lJWnqRhFey6t Z17XdC6hWu61T38SR3AlJdpzwbzM3g0fLL8LwSmaPrn30mHIOBJKWzGFy0f+6ch+3aUo bYlnfHkxq5e72RGAvQg8DpPAl9+HqupTURTjZovfpFmXvjiVAdn9wqpqmlSrXD5ionXx 7+TnKj+MW7twv0P9Lq8hio/lMh2oln9KDPEwnvOryLeUxr09DXINaGHvaHEVZE/oniEe GJZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=cH0d4FLWmY6AMH6e3Eh7cIMBr7c3yrWi72+uVeb9x1c=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=N/vqaiz/sW7VZbOi6aQOuXlkY60Yy57cyqXud5ywaPF8H3r78FUZpKmDFd1eNfk2Y+ hYLx4mwkrklTzgIr80YeJJro9b6F2x7OWBI84oEd2f4bBa8/uREVAzPKcAFlOtRWsWgp 4wHzQBnrag9Aec+3e43AC60CwY7mp3/v+GKVtyL0xAHlUDktIeCRe+shrFdYyu1SBck7 9EFtWm0wHGz84tjJ+XkI0TDndXkc0BgbKC62F5tjF7AyaLBx66wDkpH787BqecGxF+W6 yeMSZ3qBFuBbxKwR9TQHo4C6D9zjkVMih+tAJuNxFPiFDAOlZWXCiXLq2WO3eIj1fws4 kmsQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="l/2eShQO"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h12-20020a05640250cc00b0056e6601fc9asi4590168edb.469.2024.04.15.09.28.39; Mon, 15 Apr 2024 09:28:39 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="l/2eShQO"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E00C68CECF; Mon, 15 Apr 2024 19:28:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 282E068CB86 for ; Mon, 15 Apr 2024 19:28:02 +0300 (EEST) Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-345b857d7adso2569654f8f.1 for ; Mon, 15 Apr 2024 09:28:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713198481; x=1713803281; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=14hfzgm4/+7TNbrCrIPJlFtaOe+A7suYHw2xrSypk2I=; b=l/2eShQO4YshKpXpJit9sSZjDje4ooANUGA9bq6e1I8+uwF4iSaPKLyXFFUrpam3wu EdLRjGSBCIuBkfopnoGJfj/cXHu8MU6MWuUD/UneqPRVECsBbOLXCkIfzjeQ5M3Cp71T QURnDkJjbn28+j2v491QG9e7HgHcNQXpdt6VCdZoEbRUOyYC1EqBJEB5R2suP7wtb4sN ZJV8JKEt08Nlt0MEtYq6pJwqia7WYhTr+MnsFN3URwb+2EaRQa0poRMcUW554xiNlJ7N TYjIDLMRETTQo1KOm+OszJWqI5+WKNZvrkut/l7DCCZ64/tF0dleHGc//NPqZ0PLmxsh NNsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713198481; x=1713803281; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=14hfzgm4/+7TNbrCrIPJlFtaOe+A7suYHw2xrSypk2I=; b=p76oc8aK6/U1SZW2cf8jtQeFLFV9yx1g3VizoXIYreJ4vxjbxZpkdc4EV9/inZJma/ ZDE3HNNYuD8iSlT8lzNUtW3csXULP1c45n81Vps6ACU18j4+7RquPfe2TrNG0XOZv1Vj OneM7QrLXxT184OV9TBR53S+E5cSBiuqq0s9JG7Sih0RO2Zy+h9is5oa9MIoWijTlcTX XY0MBIZ+BQgkjisp+eGFYpYZumfYU+tk0WtVCshJGK3s3cS5m0LNv55tdXa5MCsD5kwr dJaslbnRPcSy4wa6n4RjFOhUmmfzJWbLaWEQ+g5v/BmI5LwZy1T4b5TUjos251t05ut/ /Tzw== X-Gm-Message-State: AOJu0YzKrC8u9PY0GwpUD5Y/7epH7tCcAj9A3icVVsjPFOhVbJUSu44N Ual8iLNCzhdcAp2gWJbvRKkdMJA98WDJyBhXqqMN7wkXAfBk8ta9cTZ0GQ== X-Received: by 2002:adf:e349:0:b0:346:9301:fef1 with SMTP id n9-20020adfe349000000b003469301fef1mr6887415wrj.18.1713198480721; Mon, 15 Apr 2024 09:28:00 -0700 (PDT) Received: from localhost.localdomain (33bf3d9d.skybroadband.com. [51.191.61.157]) by smtp.gmail.com with ESMTPSA id u8-20020a5d4348000000b00347c187a3a0sm3899969wrr.24.2024.04.15.09.27.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 09:28:00 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Apr 2024 17:27:38 +0100 Message-ID: <20240415162741.110374-4-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240415162741.110374-1-derek.buitenhuis@gmail.com> References: <20240415162741.110374-1-derek.buitenhuis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/6] avformat/http: Don't bail on parsing headers on "bad" HTTP codes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KqWyScbQfsv0 Many "bad" HTTP codes like 429 and 503 may include important info in their headers. Also, in general, there is no purpose in bailing here. Signed-off-by: Derek Buitenhuis --- libavformat/http.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index bbace2694f..e7603037f4 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -1086,7 +1086,7 @@ static void parse_cache_control(HTTPContext *s, const char *p) } } -static int process_line(URLContext *h, char *line, int line_count) +static int process_line(URLContext *h, char *line, int line_count, int *parsed_http_code) { HTTPContext *s = h->priv_data; const char *auto_method = h->flags & AVIO_FLAG_READ ? "POST" : "GET"; @@ -1166,6 +1166,8 @@ static int process_line(URLContext *h, char *line, int line_count) av_log(h, AV_LOG_TRACE, "http_code=%d\n", s->http_code); + *parsed_http_code = 1; + if ((ret = check_http_code(h, s->http_code, end)) < 0) return ret; } @@ -1338,7 +1340,7 @@ static int http_read_header(URLContext *h) { HTTPContext *s = h->priv_data; char line[MAX_URL_SIZE]; - int err = 0; + int err = 0, http_err = 0; av_freep(&s->new_location); s->expires = 0; @@ -1346,18 +1348,31 @@ static int http_read_header(URLContext *h) s->filesize_from_content_range = UINT64_MAX; for (;;) { + int parsed_http_code = 0; + if ((err = http_get_line(s, line, sizeof(line))) < 0) return err; av_log(h, AV_LOG_TRACE, "header='%s'\n", line); - err = process_line(h, line, s->line_count); - if (err < 0) - return err; + err = process_line(h, line, s->line_count, &parsed_http_code); + if (err < 0) { + if (parsed_http_code) { + http_err = err; + } else { + /* Prefer to return HTTP code error if we've already seen one. */ + if (http_err) + return http_err; + else + return err; + } + } if (err == 0) break; s->line_count++; } + if (http_err) + return http_err; // filesize from Content-Range can always be used, even if using chunked Transfer-Encoding if (s->filesize_from_content_range != UINT64_MAX)