From patchwork Sun Dec 11 01:09:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Basel Sayeh X-Patchwork-Id: 39674 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2624328pzb; Sat, 10 Dec 2022 17:10:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf6R1UprsHEZCKxlFi/OrlV5EDDUl8T2qqo2hIG3qELaqyNqcowNcwBod5OMiAGdeblE1R/e X-Received: by 2002:a17:906:4bcc:b0:7c1:b65:440f with SMTP id x12-20020a1709064bcc00b007c10b65440fmr9257244ejv.25.1670721037736; Sat, 10 Dec 2022 17:10:37 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fy5-20020a170906b7c500b007c1031bec6esi2668758ejb.857.2022.12.10.17.10.37; Sat, 10 Dec 2022 17:10:37 -0800 (PST) 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=@hotmail.com header.s=selector1 header.b=rfBQLNGn; arc=fail (body hash mismatch); 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B04868A708; Sun, 11 Dec 2022 03:10:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2017.outbound.protection.outlook.com [40.92.91.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D4C968A708 for ; Sun, 11 Dec 2022 03:10:26 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WOTLi93Lq969d2WPJdJ7B/Nc2Q9ghynMhsJU02wN4UxsYGn4aOjsRX8VSj0gboP1IF9rCBy09sWBm7f0K7Z5GZMPODjhduzC+pQeYFxh0amv2m/Aka1Y0lZ6oh5jBmjpKjyqpW+TEN4YdCs/KqbQQlND6WdKdyx363bAPpzr0k+C4e2YXboBOgV0UYASHzN4ZKOcv6/L1JzcW/h97oKdEuI3S4fQ9nNb3qafB3bv6OgppZEUCjQtIyul34J+2Yb4QuT4ETstpU9j361DfXJLWl5SIUhJdfTWL1Y9n66kcNt/fQkI1kqgospwOS3rnhiZ+zp6RddFACrnaYDdaomZOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=naf6xpcXjlwr1nwWvPZ+Owmv4TzBlDtXjo6tbfLLqxE=; b=nO/AstNmfEbbSmntm7B4zhGIDQfZ/ADT3kl2Fwsrjk0BG9P3o+9+sp8unZY4O4ExFV9+f1Gu1oq/hab7nAuXEBONZrLPYmeoiVRWQjESQQL1iD0q4kUR8ecPmGSA12sNK4tQL8PnRel8FpqHSSKS/g8ATlS5ENMoaHF1cCVdzekt5Xj8OBsA92kFu6C0rlXvBhlYhE56bXciCU7u5LBDLthWOWM3CmvkaTKySHWagmyITzlsz4YPB01eyjA1aKjD8zBrbyG5lwhED0uzqDnRRnD6xg8FM6jGpOgOKRLup03KZtzZ9jRvwcqaN7rckXlabrrz54EGVQ/jAtkmdfrV/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=naf6xpcXjlwr1nwWvPZ+Owmv4TzBlDtXjo6tbfLLqxE=; b=rfBQLNGnEhYRMojTh00rGWDS3hwcfI5mtW2D9Lxz+yBfXq2nOuJjBahl43szyzeudDlmxVC3LMtQC9C4B6yB1YcUsGVE5e1AnxPCRFAT8BGGpGX6Z0n2fbffkCimImsmydBXiPxk22i2Z2jM/0IdNnz+twLTzXWjPeR3wd6nyYBexH4G8fMPkdoIz/jrF4B8Ba6HZuiqGbRpOsuIhLFrlm2XuSkXJwoRzHXjEOtIvQWG7ZIHLNOI7lZfFEuRIB68zBi82eILIraY/KBBVvXlqMW8PpIbBrJ214jjgcGBnBcOabrwKUwhJsp7BWNIFBbkuiD33M5ciAxm8+rvw8QEcA== Received: from DB9P191MB1482.EURP191.PROD.OUTLOOK.COM (2603:10a6:10:224::19) by AM7P191MB0583.EURP191.PROD.OUTLOOK.COM (2603:10a6:20b:134::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Sun, 11 Dec 2022 01:10:23 +0000 Received: from DB9P191MB1482.EURP191.PROD.OUTLOOK.COM ([fe80::bada:6a73:3b1:7977]) by DB9P191MB1482.EURP191.PROD.OUTLOOK.COM ([fe80::bada:6a73:3b1:7977%9]) with mapi id 15.20.5880.019; Sun, 11 Dec 2022 01:10:23 +0000 From: Basel Sayeh To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Dec 2022 04:09:51 +0300 Message-ID: X-Mailer: git-send-email 2.30.2 X-Unsent: 1 X-TMN: [3MYS4YRrAsLZAGc3+aZJZ+t9Mok4gaVUDcz+Mh93Pe45+S5tzdw/MrzkKAatNUH+] X-ClientProxiedBy: DXXP273CA0019.AREP273.PROD.OUTLOOK.COM (2603:1086:300:2::31) To DB9P191MB1482.EURP191.PROD.OUTLOOK.COM (2603:10a6:10:224::19) X-Microsoft-Original-Message-ID: <20221211010950.39879-1-basel.sayeh@hotmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P191MB1482:EE_|AM7P191MB0583:EE_ X-MS-Office365-Filtering-Correlation-Id: eac78e9e-c273-419b-d223-08dadb14799e X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxi9Slp5k4TH1zaWE9qyhbTmkVphNy8PnrvUr/0Xes1emDL+TcM48J5BLUd9XdFlINj4O5Tu04rPYvPL4qtWseClHZrN2FKe/DAyhfj3HpVWb965Rws0yoPvFi8E6Lo7S2GVF3tvubLJkXC43zGeqaFZ10/TwuvL5px3yqecg4GBPsfxvliRTDOa4hXTXzUB+ke/c5NcNJgu2BRb6B6w/4YZN1fEq8bFLNZAH9sR89Uyvy0A77/guGC9wxgi28uKEZlqjaLVQEZ5065JWM938tFmmjIRK8KEizY33INgl7r0ZP/JYEn1M/7HEiphhUHkrK5l4l8jfflUnjwHo0Zsga3hqLuqt761MqaLvJWL/gNQJKQOaj9k0aznpFRiCgpgmquucwa+uwSYjKv8H+YCnm8Myxl9KL4hz2BWlJUpx/gs+L1UVX/RV5ukpuYVeXeRZwSMq+4A2F+0Y9nXzgZrGyArdvGZf6M1F0g/7n6+l5NJdeuCGmV1H8SoGZbJ2tLczdryyQeOLez1fQxFmPufWc6cUNt9SQy6FP59XLr7wiP9DNXdSLHKOdfHaDxuJdUXZnJG0glASiBvZuPk6mR3uZV5bgrdRqNXdclSiL+UrORKpiJ5dDY8orhRSR9hE/AGe3DDftgJZ1NQdjoIBV9Z3Vj7deQaINyJPeL4WQPoE+DfMk03W7L6JF0FZCfdop5p257A0F9v49xHKSp6Uf6k6qhsRBUgyFs9rA= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bPH0BFMJf5TiBt51zlo4fLAtvs/rmvR4sxwUEs1U4dv24AtBrL3s02Yht6NtnDplrzTLs61cdp/i3jaogsUvc4eGda1nzi2ZB8aw/h/3inbldrcpSt144OcEgyW0iHIS5tyxM3QFei3wiC0+PmOxYgee3/DvUp3cYo2RUz73KOSmhYdIlyMqUnNzLoiAxzQc50rReG3b1TZAFarbAD8W4HmMm92ABYD82sKmCl2yRQRDFgAfgGs5Z2LnrncdhAKDoZw5u9I+1597y/FX+F4EyNzwa54f19EBE1+UmVcA6fQPVCyQLaggLBhVLpnhCeh+h6DQ1zFwUkZgHsCISH3J9jvSgzshi+qZWpAxfdIhZFJdaEqz1Lz3Uj2t3CewdTaWe018DOorFAYOR+B7Qx7aUp31PbhgcgtN9izf1tRW1eO5cbotECBEykocG4ZSMam259Tfm21ZrDi4vCtwhNCiVVmiPfywA0uQEhBg7bpHsdvuqCjORB1Wpih0zpa81BBjPy1XClbuAKqZuP+iQyM+uCvaJyfY2uqiMc0VaDxzd3p1wjqPA24yPWWNkBpPHcRr6CPBrZxyKlCh473pxynRpwNzkJrfQDKe7yyq0gY44eAPZqewUJNtIM4eY0ejboH7Gewmm6y3LWMS8F93cgWhyajaEsD4mTqXEyrf8zELRZY= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OlJBAKoVpgXDarvZpyLiv2ncI5GvUtWGhHZOukEw55zmQOObpGGKmOU0mDp8Y+5/0YWDRwyZMoM8lDFhYRbBoVI56ySqNuiYPuNs56pivCfAc0JuFk4J1rMnp/ClapMCadIs9dDGQYRmdZmjHYtKToLnq4GbEjO1MATfPdYzlONhobQOD/ZADYf12cJ0r1IGPkO8QUNWXX6NHNcjdfbUiFyf0Z2Jd261Clk0YMLlDctT+IVJ4Gg+hI1DH3U0ohzYKaC2ksla9FxcqOvbHpFRn45BxWhruVU+cY8yG6KVWQVbtH2iuuOFE4IxVD1YYOVP3XML63ibbRjPbTBoVuqazRLp4uSpFiqe4/IG1v/ppGRBvsmxontj3gxKSzFnhPgGSHJUeSE3l1k9mT0GqfBB5h7pwXuQkRvrIHpwRJEtZqtuS52o2MVAHvJggNx8P9matAlSZ1TeWwsjZk3JEJ6L+HOqvdEQsg+ySeqSTT00Wh+x+6P4cyyiZd/KfpChUSpCLwFJj6tHxHdgL6YUbVjJTic1FJGowgX2zrYCh1UXQejo5WIr16TIMCn5Q/w0yhFEGXMuicIrJyoBYhPFrdlo2MS5l4EB0lIK5Xl0wbgy+29j2UbdhLoe8dxB2457sBMy/Pxr7NOPBEjQjD4OUMW590SlDHEpx+H4o/JHwrTDyaxHRljepXaplUnE05lUUJP84maxZsf2RyBX9q9hVndatRHKsur6FEmUi4w/c7zBkyFgviHJ0k49Na7Y+mkKanQNZa6rilPxlz53RDsTIeyAc0kIqvDZFtW7G5GmnhFNEbiwZRbS0yzUPOnn0K6FWv3gIQGPbZcTAFI3Ns3oqngY3uPYf5QgQXOCenrlA3haPhHo9SS1MHwfJa1nDDTmdepdZn0/ukrtWHmhMhZo3iya8xr+EM/0pk6iMTbvxdD3VXI/IjztsRk9qegsxTmtPEcBPkdr8YuYSKvkVnvSL+4PlSPXR1BcBD5y08g5z0Ef0KT5lIRQbEhUckTOUDPFCQJS+PUSX0CbfQ7PmRQgz7WS02NbgAmjTsoXPSITCpJZKowSP5cJCImkIekM94ES33xZm1g2OdMRkR0vIPbcRefk4/fLXvp4tTFKIcnU0c3SOcudJyk1RFOuShxtH8VTO8gqrPGOKq1dU2QPIz8tADpf8pqE6ZfGcD6Er8iQos9P0eIElwOZN161igFWmF9hQespiAunpyvoabLkyBmGCN4kUxJSz00nGO/uwoweK5rfd55DoQFGSUQGqhQezfvR9+NvT2TkUqxh7BjLO9KxUPfQuXB0v4cigN8TwzeXM+mu4pKvF9+MEtOwng4fTUR8qnKchHKUOaKztaZcZllVxfc8ig== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-50200.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: eac78e9e-c273-419b-d223-08dadb14799e X-MS-Exchange-CrossTenant-AuthSource: DB9P191MB1482.EURP191.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2022 01:10:23.0449 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7P191MB0583 Subject: [FFmpeg-devel] [PATCH 1/2] libavformat/http: Use http_read_header in http_shutdown to react to response errors 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 Cc: Basel Sayeh Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: oWc4DHG4xwsy Use http_read_header to parse and print/react to errors in http_shutdown if the http server responds with an error (404/500/...) Signed-off-by: Basel Sayeh --- libavformat/http.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index 7bce821535..123a7c77f2 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -1853,15 +1853,13 @@ static int http_shutdown(URLContext *h, int flags) ((flags & AVIO_FLAG_READ) && s->chunked_post && s->listen)) { ret = ffurl_write(s->hd, footer, sizeof(footer) - 1); ret = ret > 0 ? 0 : ret; - /* flush the receive buffer when it is write only mode */ + + /* Read and parse http headers when it is write only mode to react to response errors */ if (!(flags & AVIO_FLAG_READ)) { - char buf[1024]; int read_ret; - s->hd->flags |= AVIO_FLAG_NONBLOCK; - read_ret = ffurl_read(s->hd, buf, sizeof(buf)); - s->hd->flags &= ~AVIO_FLAG_NONBLOCK; + read_ret = http_read_header(h); if (read_ret < 0 && read_ret != AVERROR(EAGAIN)) { - av_log(h, AV_LOG_ERROR, "URL read error: %s\n", av_err2str(read_ret)); + av_log(h, AV_LOG_ERROR, "HTTP error: %s\n", av_err2str(read_ret)); ret = read_ret; } }