From patchwork Wed May 17 01:37:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Micah Galizia X-Patchwork-Id: 3684 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp715102vsk; Tue, 16 May 2017 18:37:50 -0700 (PDT) X-Received: by 10.28.166.12 with SMTP id p12mr690026wme.23.1494985070032; Tue, 16 May 2017 18:37:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494985070; cv=none; d=google.com; s=arc-20160816; b=ReaPbpwMMwON+EK96MSFjyiv0zXnfS4jx/0O3HZx7UCSKpHLqJM+IRnEnyNzJCPUtU My8Mmtv+2w97rLJYHKLfLGZTI6LBYHLje7aG96SLJ1rJGQj2qNGWy0weuNzEPqBKlaZZ CGvw79X4/9/97O5PvolUn0WDLfCCB1G15sYQPCFI3dk7stBv+sToTskckpeafrwMZurH edjv7lMcakOpMzygOKKJ7pZqyImrCjgV2cG5eZnF3M4mUzRLzlvKLZkZ8QlvHq2dOIeo O62vszBCNdihv5V+9oM9he7P163lDGzi7tGdDb/jpGpp4R3anpiucfbVluuRk0eGjfzc dIKw== 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=tRBWaBlBS1GY6L+zcJCuSZybs0/dHPnCLGtVqgE82+M=; b=e0SoU3yIKUjc9aSDiNFADlh5TqE/66CR6+Z4qudYkGhytUHSPdxM3+JznKUPx8kvG5 AXjcAgOBu5DT+eeTjrm0bfRIsgHOf0LfNJkisTEBc/bQV4jnowV7+tzHefrz8UIz2w/v zBc8TUhVrWlNv1bvrzGybYEHCW5+c6gummS4hPQWciI5uBOFSSLLm3IORn3TodU6r0qm l2FkWCw58PQZqh2Cg+U+CpfwnEXzzCoqqPrYQzVWi7qjbjvHHa+5DOa91tJEJGGwmNII jfsgEQDdlY8lcGsCS/AsbPcuOcEaVlJhrodrrIjiAzE/LUL27+kXPNkI9TTzBTEqm68y m7CA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE 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 79si1002318wmo.18.2017.05.16.18.37.49; Tue, 16 May 2017 18:37:49 -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; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D061C68975E; Wed, 17 May 2017 04:37:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f68.google.com (mail-it0-f68.google.com [209.85.214.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2BD4680C06 for ; Wed, 17 May 2017 04:37:38 +0300 (EEST) Received: by mail-it0-f68.google.com with SMTP id l145so163224ita.0 for ; Tue, 16 May 2017 18:37:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7sHaVYHuaP47HL9n3gQ9+oeGPfL4h4zm9oBc/r8JW9w=; b=LvnjEnYhdDCrVjYDK6wzCVSRQqUjEEPFOVB5rrjHpeOCOZlDeUGUc9/I4hI2apAV06 wTXgpW9sP2iOUk0/H4kS2E1YfpD8b9l1eTlPGizqdlYoLARURZ/vRr6udMcT367Y6ThW kaF4IPhikAJuTOjFJBUxLq5/kXWoYsG3yGRu46iXg0w2LFTmf/lt6cmZ3vefPBpYX/QC DG+iZz1J+YR5s7GPrkbedsbyEpEE2ynrL5gKFtjFFNKwq3miIDsVgda+2t3adec6boEd AMM8HGeF6yJE8rTpjCNlOvkLRfU2jlqCAkIdZEx1CJSrpfNh6kxRABF9WiH4Qrw+gViT 4T7w== 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=7sHaVYHuaP47HL9n3gQ9+oeGPfL4h4zm9oBc/r8JW9w=; b=Y9TqfjxY2IBko81aSdlVgBnzO0KdPirBFIaGLEYjSG8y3yhmXg+6mxiFTI/gkzIUmZ 6FnrkcOREe4eWyNzj4ZYzcKn8a8AfX+SiPNHyrnFOiE/5Geg5LyTUaV1X5mE/I+iP5uB S1HHSCDkg2/HY9UurbFpRD3vC4haA1jFZMzJZdIcy8rpgZdE6br0lkWvAP5ZmusS7qei 7vqJ5X+SktVCWpcWNrNER1LpNHZ8QP3/KEIdBMnO0ZWIJ96gcLgU5uVOnIK76gQGeMG1 fC78JMoPR45lXVOH9pNbRUeUY8x2Ch+9iOhX8agA4L59Vk7xyLnNoqb+94bUO3zuue7T Hrng== X-Gm-Message-State: AODbwcCUy+LUbeWUaqLn+R555/w127mRDUvb6M/nnxCZkC/M6wSpOlGj pW7r0PheNy4HGw== X-Received: by 10.36.110.132 with SMTP id w126mr13672483itc.52.1494985058061; Tue, 16 May 2017 18:37:38 -0700 (PDT) Received: from localhost.localdomain (dhcp-108-168-3-172.cable.user.start.ca. [108.168.3.172]) by smtp.gmail.com with ESMTPSA id e126sm298344ioe.12.2017.05.16.18.37.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 May 2017 18:37:37 -0700 (PDT) From: Micah Galizia To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 May 2017 21:37:31 -0400 Message-Id: <20170517013731.31496-1-micahgalizia@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170516205752.GT4759@nb4> References: <20170516205752.GT4759@nb4> Subject: [FFmpeg-devel] [PATCH] libavformat/hls: Observe Set-Cookie headers 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: Micah Galizia MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Micah Galizia --- libavformat/hls.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index bac53a4350..42022690f1 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -630,8 +630,16 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url, ret = s->io_open(s, pb, url, AVIO_FLAG_READ, &tmp); if (ret >= 0) { // update cookies on http response with setcookies. - void *u = (s->flags & AVFMT_FLAG_CUSTOM_IO) ? NULL : s->pb; - update_options(&c->cookies, "cookies", u); + char *new_cookies = NULL; + + if (!(s->flags & AVFMT_FLAG_CUSTOM_IO)) + av_opt_get(*pb, "cookies", AV_OPT_SEARCH_CHILDREN, (uint8_t**)&new_cookies); + + if (new_cookies) { + av_free(c->cookies); + c->cookies = new_cookies; + } + av_dict_set(&opts, "cookies", c->cookies, 0); }