From patchwork Wed May 3 00:47:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Micah Galizia X-Patchwork-Id: 3563 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp2144824vsd; Tue, 2 May 2017 17:55:40 -0700 (PDT) X-Received: by 10.223.154.40 with SMTP id z37mr23186721wrb.136.1493772940912; Tue, 02 May 2017 17:55: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 j71si4601407wmg.102.2017.05.02.17.55.39; Tue, 02 May 2017 17:55: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 7826F688263; Wed, 3 May 2017 03:55:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f65.google.com (mail-it0-f65.google.com [209.85.214.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A8C97680507 for ; Wed, 3 May 2017 03:55:26 +0300 (EEST) Received: by mail-it0-f65.google.com with SMTP id v135so4459669itv.0 for ; Tue, 02 May 2017 17:55: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=O4PIlozENM520P+OIS61tQP6gVbFMFgD+G0cffKSLf4wfZ/yZLl4V4jchTfMHZusVn 9VlFlN3Y+ciWmUkznmy1qcR4td36+uJ5LYGTnBA529Cn5ZHsFMyAu+hmu74qdr5XFSqW Rt/5+vaX22nEGYYXtA62kUCvccdY25rEHP8fLh2XJDtje0dODpW0m3dJ50l4Koo4mTJt ol1u6eldHHZE4C84Kjo5+N9ranAr4BURReGvSEIHambAH58xttDI/rMleOU7bYm0I7H1 Rr3duPWArHu6iz7d1q66Zu1rPVBdSZ/+xX2sLgAbDL4IzEG6yJsw1N4NDMXgCQmXSakO B27w== 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=C0lmsF0/5q49sb/nvHdzIaxFKCC2wHEdTJ3p0f4PPt4xB5Tb6+7fu6RfnjOrFXDIdu 157w6r/7OqXnGITjqSWEzaLBlFqWoxUiJ793fkg2ZJZ27fBtPIDYWBHvnmwkZXfqKwf3 gXajbIOgb81JNKDOPdRRo0oPdS+BCKfF8x8UZwXPuW6DfTLUSYAzwCQvm18Vaxgup0/6 TLCjLfETue+yjviLq9UEX/3sk/O6rI7Apc/0djW/hUd5rAullIeOBiQfjrOTl2ffmzqM HTOpJ929JCKuCMXkgnMee1q0p1xZgQQr2m7ZCrRfipfX0fY/34cwJhpd77etOtis8vL8 ykIw== X-Gm-Message-State: AN3rC/5oVpkljeTSoNyUVe78br0vaQ4D9cC3aHWG9y8zcdhB1j5HJ9dL VfTH7ad/M6RqzQ== X-Received: by 10.36.133.133 with SMTP id r127mr6618141itd.78.1493772458238; Tue, 02 May 2017 17:47:38 -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 p196sm271419itb.22.2017.05.02.17.47.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 May 2017 17:47:37 -0700 (PDT) From: Micah Galizia To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 May 2017 20:47:06 -0400 Message-Id: <20170503004706.19458-2-micahgalizia@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170503004706.19458-1-micahgalizia@gmail.com> References: <20170407084829.661a8229@debian> <20170503004706.19458-1-micahgalizia@gmail.com> 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, 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;