From patchwork Wed Aug 10 19:18:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Barsnick X-Patchwork-Id: 142 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.67 with SMTP id o64csp521154vsd; Wed, 10 Aug 2016 12:18:21 -0700 (PDT) X-Received: by 10.28.20.77 with SMTP id 74mr5364059wmu.1.1470856701755; Wed, 10 Aug 2016 12:18:21 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j8si41054378wju.58.2016.08.10.12.18.21; Wed, 10 Aug 2016 12:18:21 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DE942689C5C; Wed, 10 Aug 2016 22:18:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 580BC689BDC for ; Wed, 10 Aug 2016 22:18:08 +0300 (EEST) Received: from paradise.fritz.box ([80.144.16.150]) by mail.gmx.com (mrgmx003) with ESMTPSA (Nemesis) id 0MgtWa-1btTaR3iqW-00M4TH; Wed, 10 Aug 2016 21:18:07 +0200 From: Moritz Barsnick To: FFmpeg development discussions and patches Date: Wed, 10 Aug 2016 21:18:00 +0200 Message-Id: <1470856680-4536-1-git-send-email-barsnick@gmx.net> X-Mailer: git-send-email 2.7.4 X-Provags-ID: V03:K0:0tAMENKXI4IxormsL8VKQr3VKSm7cdrBCCZ3uKchuAK4NaDFBXI 0TUn/rc0H8gaewwU16XlZJE7RDHNR/KoWzl3aCSpfnSvVlz/lJv2bp6Ds8w8xgPE3yrimZ8 W6hPEFcTCeo1+d3Nm79tyoRGC2kZeN3PX8EU/bMzfcbiSMkBywy0CbRzGctyAWuMJWqkta4 mZxPAA8aWQ6BtnDNOAdBQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:h8gAVDgNJOQ=:K62VJHO3C/i6tub3o7JoP1 TiAGvQ7rzyy7cRTNACAU/p+8XfxNw65y2xPj3Oer5+MIFr8vXoSEMRl/r8DRxhkWrBCpe1tZL tuufMUFz/KV6BmmVDpnP5/QRg+MZ8FUtYImASDaN9SxRo6zJxTty/4Jhe/tDb0z4XUqRO4jIv hghbGIdCtLuKaFQvAZLllKrvMBZltzQoz1TwddVApwWrCfLdvDuNf5len4VFQ+ikkHKfJt7fh 7/wCvseizY3mNSGl0zUiT0lnHUpQB95wn5EoN1YVVWIptR8yuuTvbcD02kspFBeQQxuKKPMum 4RNGFBalW8n11zZnAvTGaEdUWB5HXUCkokx6Ddc70CamdhQYGke/8cy8/32px+Qiam+jOfw/b cndoQPenvUVcScBHvXZyek0R/3zrA3Sun/s6v6Sr7mFezLRoPrHE+fDhuIHTafqjaiNokxmQ4 vJaaE2hWkGTY1/Q5YM8M3R/VztIJ8l/m24RXWyKlW3xhQWilq01sXTpLnDnimlkVy5UibL+of hf8aCh72sFcRK3UQEX2SG0S3/TZWJKweouxRWNaSkoriY/ENgnIT8xj+zklbF3NPFuiEKzKzJ 9U8MtDNB/13UON9j9Y3MPpEIYM4+KYJ1kHKOl2wmg8zI5HstQ8pOLMC5gaLOzVik0SWAP09wL DMTHf3bOHYAImd9H6jxtqS7v9Vg1gyA/mTESsFUUeEM/5oOf+ikMCa6/1oAQ+qLnNYfd8V7xk E5SFZl982ZI11XCp6tk99PN8BgR2/tVVUGsgyiC+UuWWzx5nd7mJTtAQqMQ= Subject: [FFmpeg-devel] [PATCH] libavformat/http: add support for content_type option in listen mode 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: Moritz Barsnick MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Instead of silently ignoring the content_type option in listen mode, apply its value to the provided "Content-Type:" header. Signed-off-by: Moritz Barsnick --- doc/protocols.texi | 2 +- libavformat/http.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/protocols.texi b/doc/protocols.texi index 5767e23..470c99c 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -276,7 +276,7 @@ value is -1. If set to 1 use chunked Transfer-Encoding for posts, default is 1. @item content_type -Set a specific content type for the POST messages. +Set a specific content type for the POST messages or for listen mode. @item http_proxy set HTTP proxy to tunnel through e.g. http://example.com:1234 diff --git a/libavformat/http.c b/libavformat/http.c index 51275d9..cbeaebf 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -355,7 +355,7 @@ static int http_write_reply(URLContext* h, int status_code) case 200: reply_code = 200; reply_text = "OK"; - content_type = "application/octet-stream"; + content_type = s->content_type ? s->content_type : "application/octet-stream"; break; case AVERROR_HTTP_SERVER_ERROR: case 500: