From patchwork Wed Aug 1 23:00:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9858 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1378457jad; Wed, 1 Aug 2018 16:00:48 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd2R9TIowppBkQrnBnaG6oJOO5roTae2ZL6vW+jWTxNMysBQal9JN5Y4f+srEBCc5Gjm962 X-Received: by 2002:adf:8276:: with SMTP id 109-v6mr178782wrb.127.1533164447988; Wed, 01 Aug 2018 16:00:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533164447; cv=none; d=google.com; s=arc-20160816; b=UMFRewkFT7F7WOZMyApbmQUYgD8SDcGEzYAMiU0CZ2m3IMhzebN4+gz2u9VpwTMrxG pw/qNO+XThVWsPREOiyaNU64m6J2telc8JPSqpIr9W3HIEsX8a1CYLjOpUsQblS9xX6e sGNuxKwjMHxaNfEnIajc0PoROJuO0cOUt7IcQvoy8DkCe5k0V7HX0cOBuxH6VkLJZe94 N72++xTjhANqpHmqD3p0IKiRO25ScP7g/zAIjKyq+r22IX1NS+pEkJgVbBwNmq3e/Ue5 z7pZPMpvQ40w/Ipds/lYTempFlwNheKzDsg6hr3xuJrw6LAgBCO3djnq7P+NyObcVgoZ YVEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=XzbEExK/lrD/5K2Y8URalUoXIv9t5W0pXwxiLzJk0hc=; b=EMVxD+HpMeG985LgITxf5YAEDsmxplt+4dJ4ms2Pd+dyCiAxLhUXxFsFbBjuMoxLV+ o4O4YZjuTIclWaK1BwJRRq/9q+nTL76+Q/IVcnPjX4M12FTks312l0ae1Eu5EySweeVK o+F3F51wJRNtCLd8dZGY86HOmzs+TJs/MmREe1t5Y8t8KB1vEVy2WVGzUW6hAXoKqfpV Mehs1bzPYkjEMxYyvBt740I48FSf/bCq1ragygw//j8pP5Fq6GAzz92EsL0qz5gi43kY LxQ057CzS8ubrv63dDEYvrHjBqe8+JajN/HUdS9PIo+KgV1xnPisySPbgISd0Mjsy7pC uCLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b="ZOTF/L9U"; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g124-v6si69408wmf.13.2018.08.01.16.00.47; Wed, 01 Aug 2018 16:00:47 -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=@googlemail.com header.s=20161025 header.b="ZOTF/L9U"; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0577A68A54C; Thu, 2 Aug 2018 02:00:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F18268A45A for ; Thu, 2 Aug 2018 02:00:14 +0300 (EEST) Received: by mail-wr1-f53.google.com with SMTP id h15-v6so209360wrs.7 for ; Wed, 01 Aug 2018 16:00:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oSQCffvS2yww+e1hAXWKjAt9yyUqIPxk56DfJOiqbtA=; b=ZOTF/L9UZPmPZCsx31yrnShvFEeu6t1Dsmz3mQKukjs6d4aOU98LHdfKKIrmWQLotR Uu3cGZI0SGRIfgnfrflnM82mOglpfnuBORhpspizCY/JdgFQ7G6sU1vJ1KdI1tg+IPja F21fDDohRqqTqPhb0/gfVj/W6dJdQDTxxaEseabEExxpbPmX/dzvUEvEMU+9LL/VEBQv MyIArMMo3Yc6z3elYVEzROXzVFsTUJIDWcxWnu+kCqA0vELdBQQDeaI9m70kLaSRLu6x xnhD3i9TWna1BsV5rf22gBCrXBlIMCGANcGJv/ISenEmjOgmZZqpfTcjDtrzCtANR5ka RRxQ== 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:in-reply-to :references; bh=oSQCffvS2yww+e1hAXWKjAt9yyUqIPxk56DfJOiqbtA=; b=XyyOfh7Bnj8TPbS1DZTwd1fHqIeORAGXF0Y3quHhauqLwPvBLtdS7913bGFsksLANe y9dDAXcqigV9HHdmbPL/bSP1V12RJSxURvWxBCnpR37tb/uWtOri3SKFUBgsjLzWafne q+iMDwtUFW/TDqB4Karw/3+iZ3+7Jk09uZrUjIVq64nRLaKNqn1kxX7i0hbTsWsxN/Qb tWLMd2NvOJ9JMrYs9EwOx/XUsNDZKKXLOsJHAQQ4gSzL3oi8uHuU0++y0737jGdpwob0 B2fI2qpqc4aDRmOzl8fQrHxnLzr4mNG1zxs+i+mtRQm/8HLYi37Eh+OJXWfe+/LvDUW3 HF6g== X-Gm-Message-State: AOUpUlFG2RucAEaLa2GNqqiHg56WeGFrHI3e42YYu6k53J/EEdoKPZ/s WuyAc4KhlR2GiN6F2/DrZfHdgXyf X-Received: by 2002:adf:e287:: with SMTP id v7-v6mr181696wri.139.1533164431587; Wed, 01 Aug 2018 16:00:31 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id e133-v6sm101201wma.33.2018.08.01.16.00.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 16:00:31 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Aug 2018 01:00:19 +0200 Message-Id: <1533164424-12395-3-git-send-email-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1533164424-12395-1-git-send-email-klaxa1337@googlemail.com> References: <1533164424-12395-1-git-send-email-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 2/7] ffserver.c: Disconnect client if file was requested, but no fileserver was started. 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: Stephan Holljes MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Stephan Holljes --- ffserver.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ffserver.c b/ffserver.c index 3b3451e..087963a 100644 --- a/ffserver.c +++ b/ffserver.c @@ -578,6 +578,11 @@ void *accept_thread(void *arg) continue; } + if (!info->fs && requested_file[0]) { + info->httpd->close(server, client); + continue; + } + avio_buffer = av_malloc(AV_BUFSIZE); if (!avio_buffer) { av_log(client_ctx, AV_LOG_ERROR, "Could not allocate output format context.\n");