From patchwork Sun Apr 9 01:53:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Micah Galizia X-Patchwork-Id: 3344 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp846054vss; Sat, 8 Apr 2017 18:54:40 -0700 (PDT) X-Received: by 10.28.7.13 with SMTP id 13mr4792230wmh.16.1491702880069; Sat, 08 Apr 2017 18:54:40 -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 w7si5887345wmd.149.2017.04.08.18.54.39; Sat, 08 Apr 2017 18:54:40 -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 04AF86883CC; Sun, 9 Apr 2017 04:54:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f193.google.com (mail-io0-f193.google.com [209.85.223.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55212688361 for ; Sun, 9 Apr 2017 04:54:26 +0300 (EEST) Received: by mail-io0-f193.google.com with SMTP id 68so10770329ioh.3 for ; Sat, 08 Apr 2017 18:54:30 -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=Ft8CMU8xjwm0UcXhm2up9BX/mZ9CfFhn99UbYDDO6lQ=; b=Mz1wlGsBoJMnTQC2JWJg3HAj8apuBFdUx+N85XdZ57+jSZGcuHlgTt0MDL3S244SiB bEIPih1ky+9IntQoNAIBmThkPftXce4qLEfJ8dO7fDwFVPDjce158ILV8MUcgww4HLH7 zZkJZviv6yhQCSgef7VvI5vHXZby72uUYXPxdcq7iIRhoHTCpNwbAdsTWS8g+c5oBt91 xuxHwtuEwMa9jAYLcrdkK/Vj7vR3u2eE/hHaGZBbpY6OGROMB+qMSuGcNsWgmE9/lZ+Z N8q8xUX+udsdAvJt1xpS6QKqOp8uy3oJSMMhFm9+qEHFvm9IuJjPeInic1Bzvo3b/jhe b+1Q== 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=Ft8CMU8xjwm0UcXhm2up9BX/mZ9CfFhn99UbYDDO6lQ=; b=F/qXvwcYSyKNRsGb1Q1iIuUM7X1BcdFmQlqf9LDmb4h9j5OsNW2nBJzKBsR0geKIhk NLjSvJXK/TCjL5imUk6yx+DNRc/fYf0OuE2Vt9+GnyPgfXdM9BmMFoOeTyWz8hlESUX6 GxuVYx8K3eqstCwB9Tg1+xe6ztZidCDHxyMnAyjv79gvsPHaEpyrWy5xjWxN5R+5uCeU j4vLIm+MVdBVEDOY+nRukEymnseSc7jEVTG8QinnyrdLne/+0E5BNfV9pFijYQ5MZCye aMqHn5XXVbFe0ZAg6yAdhxxCXb1zz/RTp/ZCIAp7uY2syD6RLVXIVxpYD6aJe9fE8RcS 8fpQ== X-Gm-Message-State: AFeK/H3x6dpmFOBodBEO9CdkNAo6XQpJl/DeDnJ7k3NvrGGHFQXD50Fy4rk/W1XQEtppHg== X-Received: by 10.107.39.70 with SMTP id n67mr45214470ion.114.1491702869511; Sat, 08 Apr 2017 18:54:29 -0700 (PDT) Received: from localhost.localdomain (ip-24-54-73-138.user.start.ca. [24.54.73.138]) by smtp.gmail.com with ESMTPSA id v187sm4541079iod.51.2017.04.08.18.54.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Apr 2017 18:54:29 -0700 (PDT) From: Micah Galizia To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 Apr 2017 21:53:50 -0400 Message-Id: <20170409015350.2846-2-micahgalizia@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170409015350.2846-1-micahgalizia@gmail.com> References: <88bcfd06-e201-59b5-542c-6cb4867cf9da@gmail.com> <20170409015350.2846-1-micahgalizia@gmail.com> Subject: [FFmpeg-devel] [PATCH] Observe Set-Cookie headers in HLS streams 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, 9 insertions(+), 3 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index bac53a4350..643d50e1da 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -630,8 +630,14 @@ 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; + + 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); } @@ -1608,7 +1614,7 @@ static int hls_close(AVFormatContext *s) static int hls_read_header(AVFormatContext *s) { - void *u = (s->flags & AVFMT_FLAG_CUSTOM_IO) ? NULL : s->pb; + void *u = s->pb; HLSContext *c = s->priv_data; int ret = 0, i; int highest_cur_seq_no = 0;