From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C32A349EE4 for ; Mon, 15 Apr 2024 16:49:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6FB8168CAF0; Mon, 15 Apr 2024 19:49:51 +0300 (EEST) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F120668C2F0 for ; Mon, 15 Apr 2024 19:49:44 +0300 (EEST) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-418672b4714so6198125e9.3 for ; Mon, 15 Apr 2024 09:49:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713199784; x=1713804584; 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=ed35GbOVsIDh5igs22KbqIO4ym27MIMHMP1pm5ApzjU=; b=LVz5SyhAqkvI2MTRuAQHKmQ9OGN+A2G9PDAud6lswAmZhYTYnX03ssyolMfnRV7jaI R1oL5YZQQQyM8hUbLM/9FcsZyKLmaxz232Vu8o9H3PR4ufRKANP/ddUPiIwS1dnr1WpP vUt0UOdhSGdccupwry3Od/76ApFF09Lgg4/lEKq/VZ1XYdEP8P4vGZd71bc8glzk89l+ Uwq9FQYCNGLdrqEI/aanfT6WrFvm7op6nBglxQC5sseQWbcVhpZCIX7qkXBPX+UF8ETi mn+k1T0rrKvECWUsDNwV6JpibU4eim7dOUUqx/OqejQxBBYY9H+GjwyRvR4X4gep9nhs eJbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713199784; x=1713804584; 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=ed35GbOVsIDh5igs22KbqIO4ym27MIMHMP1pm5ApzjU=; b=kI9kplxIYUk0kCid8rt8yU8vTcPA5L2RquavMfllBtUBk2YUCSZJ9Y1/XeMyXKMqKx 0uFVAR4AvM6EX+DcOAMW4pnA2QAq0wZ3grN+jJTYpVORUpF7Xmnu1DsnxsFX7XRJFOW/ A9JMTDQ4Yj74CkXJytA8fc+NX61L357exLqSuXfHE9gBvBNIhC5M1PSPRYlEV5FR+vDT PXu+QY1vPl2Rr7wCInupmjz6LTXeF3NapIVt+b3qKGG4tetokuFKXxHcuqckt6OmpNC+ mv+XZFWV2m85BIIlUYbDGkDz05CbhnCnkMW2x575dp6AyDaYNGwqdv+UMf4/GE763ja+ M1dw== X-Gm-Message-State: AOJu0Yy+3dLkLZqBsj1cK0Z+BAw2K64CZiMyNrc5DIt52/qUYyB03qYt ei4XgzAcvdfhk7LbMb23xwNyo4NV5u/v+Z06ch7B1UqbMxaubLwiD17mKQ== X-Google-Smtp-Source: AGHT+IFDSASQ7KFlnigecrI34abQR+O/YgOdMisc6ufkBBttaCrESnZ9mYAvI2N2BvhGFljs/UmOwA== X-Received: by 2002:a05:600c:1e0f:b0:418:19d4:fe5c with SMTP id ay15-20020a05600c1e0f00b0041819d4fe5cmr5325068wmb.14.1713199783739; Mon, 15 Apr 2024 09:49:43 -0700 (PDT) Received: from localhost.localdomain (33bf3d9d.skybroadband.com. [51.191.61.157]) by smtp.gmail.com with ESMTPSA id j14-20020a05600c190e00b00418296091d3sm9562441wmq.19.2024.04.15.09.49.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 09:49:43 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Apr 2024 17:49:33 +0100 Message-ID: <20240415164933.110933-1-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 4/6 v2] avformat/http: Add support for Retry-After header 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 429 and 503 codes can, and often do (e.g. all Google Cloud Storage URLs can), return a Retry-After header with the error, indicating how long to wait, in seconds, before retrying again. If it is not respected by, for example, using our default backoff stratetgy instead, chances of success are very unlikely. This adds an AVOption to respect that header. Signed-off-by: Derek Buitenhuis --- libavformat/http.c | 12 ++++++++++++ libavformat/version.h | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libavformat/http.c b/libavformat/http.c index e7603037f4..5ed481b63a 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -138,6 +138,8 @@ typedef struct HTTPContext { char *new_location; AVDictionary *redirect_cache; uint64_t filesize_from_content_range; + int respect_retry_after; + unsigned int retry_after; } HTTPContext; #define OFFSET(x) offsetof(HTTPContext, x) @@ -176,6 +178,7 @@ static const AVOption options[] = { { "reconnect_on_http_error", "list of http status codes to reconnect on", OFFSET(reconnect_on_http_error), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D }, { "reconnect_streamed", "auto reconnect streamed / non seekable streams", OFFSET(reconnect_streamed), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, D }, { "reconnect_delay_max", "max reconnect delay in seconds after which to give up", OFFSET(reconnect_delay_max), AV_OPT_TYPE_INT, { .i64 = 120 }, 0, UINT_MAX/1000/1000, D }, + { "respect_retry_after", "respect the Retry-After header when retrying connections", OFFSET(respect_retry_after), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, D }, { "listen", "listen on HTTP", OFFSET(listen), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, D | E }, { "resource", "The resource requested by a client", OFFSET(resource), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E }, { "reply_code", "The http status code to return to a client", OFFSET(reply_code), AV_OPT_TYPE_INT, { .i64 = 200}, INT_MIN, 599, E}, @@ -386,6 +389,13 @@ redo: reconnect_delay > s->reconnect_delay_max) goto fail; + if (s->respect_retry_after && s->retry_after > 0) { + reconnect_delay = s->retry_after; + if (reconnect_delay > s->reconnect_delay_max) + goto fail; + s->retry_after = 0; + } + av_log(h, AV_LOG_WARNING, "Will reconnect at %"PRIu64" in %d second(s).\n", off, reconnect_delay); ret = ff_network_sleep_interruptible(1000U * 1000 * reconnect_delay, &h->interrupt_callback); if (ret != AVERROR(ETIMEDOUT)) @@ -1231,6 +1241,8 @@ static int process_line(URLContext *h, char *line, int line_count, int *parsed_h parse_expires(s, p); } else if (!av_strcasecmp(tag, "Cache-Control")) { parse_cache_control(s, p); + } else if (!av_strcasecmp(tag, "Retry-After")) { + s->retry_after = strtoul(p, NULL, 10); } } return 1; diff --git a/libavformat/version.h b/libavformat/version.h index 7ff1483912..ee91990360 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ #include "version_major.h" #define LIBAVFORMAT_VERSION_MINOR 3 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ -- 2.43.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".