From patchwork Tue Dec 26 05:23:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 6973 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp6454314jad; Mon, 25 Dec 2017 21:29:02 -0800 (PST) X-Google-Smtp-Source: ACJfBosYRocXO4VM354RUKHNUoudjULGFlL7S2OYQnvCgL3QQooSQk/WeURwKyFZcHrFvTeAtd/2 X-Received: by 10.223.157.28 with SMTP id k28mr13364607wre.281.1514266142900; Mon, 25 Dec 2017 21:29:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514266142; cv=none; d=google.com; s=arc-20160816; b=MezTxPASwPk91//uaLtn1NsDAR9b9GOkeO9iVSfv4noLeN+Ua+hP88iWRlxj4UBdvb xeCjFtJnj43DOWcRhy5+snUxVglm/Vx+UPrydJLouEi7HtYLVr4uGMoGgRpk3OTkr7kU tRVAK/K4PWFhdUKTQCigBlU84vEzKeTcrVjpEByiwxc/9hoAjvr3n2UH8zphOtdLG3ii PQe2QuOnGb8oPC8GpN9mMIzH4mqcGBn7PE5wC/kyRZ5tey82yuOUjRoVQ1H7glEzJcP2 kn5Hqhr+5Gv86qJofZUHtOX0CTjAws8P0+tpRAN/ZO7Dj7o/rnAIwZsKRg3TL5mi7wFJ Y7jw== 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=W+xYux+xFbiaPYUG46oIXBF3ULpkNl9SfrvSQbV2oRs=; b=cUZGCXLBrcKJbngzoh1rirUqzNK8HYcP5lzRJ54K0t5JyuXiInuGaQ/Z2rGFKgkv8e v97G7pghZxLg+Zzrxp+vC1y/1vTRioW8T4LmGqKhq3NbKupXU4cZIv+IzbusQIk9Twek yHay/za5E7YfPtVyo4P25LhGDKjjDbW0d1dNZ2aNaQu15Pc9YrHBL5XeXwexMWe0OM5j dn/fiHx4qjSCDiQuBLtfpEU0UPnIs9OZ3KL6M5i6AwlI0uuzd5HtiNKpdbBFZb7haAmP mFRjcVShydKwAc8NjEHUGq27qJ2VsrJGJKOdlCF3d53moxNPoDGiZskhRNQpp3yxlzM9 RPIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=fEsFKigF; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d8si1712392wrf.540.2017.12.25.21.29.02; Mon, 25 Dec 2017 21:29:02 -0800 (PST) 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=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=fEsFKigF; 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 7DD246882BB; Tue, 26 Dec 2017 07:28:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f46.google.com (mail-pl0-f46.google.com [209.85.160.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 57F11688260 for ; Tue, 26 Dec 2017 07:28:41 +0200 (EET) Received: by mail-pl0-f46.google.com with SMTP id bi12so17410541plb.6 for ; Mon, 25 Dec 2017 21:28:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=g6vEfUbD4K43HuZ10h8+LMHprHyoibqyLem72GUanYY=; b=fEsFKigFS8G9VwgxqLk5eX4HlCB38PDiQ2X4nH9w/xnGgGjthWw6McJwzTI6Cvb9PW UhrrDvPM76Hs7zaonOPu4gH7sfw+P0cUc/b2slxsYMWO3W2Uvt9UB6J5GWqnOsSOHOO2 CZskO7vNB48zw5Y4MRZwDR8uEbNvKL7u1AYnDn8/am7X4lOOelaCiaWzeEW8BrRAVK4t Kpo9Xr/iGoa5qz5ryltZxVSpeF9OHml7F1jVJV6OnnwXdGGuz2b469+Q3avOfMn/UKkO XanLma36SstNPZmyUwEbzkW0Trdxa7GAc3WG5g6yEi0owr3mwt70CFHU49jey7RkdfZ8 eisA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=g6vEfUbD4K43HuZ10h8+LMHprHyoibqyLem72GUanYY=; b=bp1/QCmyy9Q/C9eUR81/2P3MEUUAAhtyaLhZjATc/6uqlbeXq0+GcOsah44h6QN2dr Uh2/GjsolB27thxvcxrCFvRr2ZrnA5HjMuIcwEvZp7U8suI4B9Md3hleFYSYn85OibfX UUt4Ypjr1OW2BMVGUpv58FKAPEjlXhTe2oA/F4S/t5IeIk5yVpL1Wj7BUIGZ/90qHZhb ZKPPp3OziWBpTTa1qH/7/jTbZj55WrNZptLFiXALP5JA4FxpNYXj/2p+F2WF1GY51pnb 24TXd/73bdOw0hCJRE4SvSpc4rUL61dyv9ucEBmKsuQtuA3Dqu/7zbiuGri9wjW1qB8c Ihtg== X-Gm-Message-State: AKGB3mIjLl8n9HLGrzJyhk1J6nECM/ccDrHtm4CdGo/BlqKjjgduUpqT 10CO9m0ufjAV4Kt9rsxCf8B3tY+h X-Received: by 10.84.171.129 with SMTP id l1mr23930300plb.438.1514265791796; Mon, 25 Dec 2017 21:23:11 -0800 (PST) Received: from localhost.localdomain (c-69-181-54-242.hsd1.ca.comcast.net. [69.181.54.242]) by smtp.gmail.com with ESMTPSA id s5sm15540784pgp.91.2017.12.25.21.23.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Dec 2017 21:23:11 -0800 (PST) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Dec 2017 21:23:00 -0800 Message-Id: <20171226052301.17509-3-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171226052301.17509-1-ffmpeg@tmm1.net> References: <20171226052301.17509-1-ffmpeg@tmm1.net> Subject: [FFmpeg-devel] [PATCH v2 3/4] avformat/http: export http_version from response 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: Aman Gupta MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta Signed-off-by: Aman Gupta --- libavformat/http.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/http.c b/libavformat/http.c index 213b6bb245..a376f1a488 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -74,6 +74,7 @@ typedef struct HTTPContext { char *http_proxy; char *headers; char *mime_type; + char *http_version; char *user_agent; #if FF_API_HTTP_USER_AGENT char *user_agent_deprecated; @@ -144,6 +145,7 @@ static const AVOption options[] = { { "multiple_requests", "use persistent connections", OFFSET(multiple_requests), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, D | E }, { "post_data", "set custom HTTP post data", OFFSET(post_data), AV_OPT_TYPE_BINARY, .flags = D | E }, { "mime_type", "export the MIME type", OFFSET(mime_type), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY }, + { "http_version", "export the http response version", OFFSET(http_version), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY }, { "cookies", "set cookies to be sent in applicable future requests, use newline delimited Set-Cookie HTTP field value syntax", OFFSET(cookies), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D }, { "icy", "request ICY metadata", OFFSET(icy), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, D }, { "icy_metadata_headers", "return ICY metadata headers", OFFSET(icy_metadata_headers), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, AV_OPT_FLAG_EXPORT }, @@ -919,6 +921,12 @@ static int process_line(URLContext *h, char *line, int line_count, } else { if (av_strncasecmp(p, "HTTP/1.0", 8) == 0) s->willclose = 1; + while (*p != '/' && *p != '\0') + p++; + while (*p == '/') + p++; + av_freep(&s->http_version); + s->http_version = av_strndup(p, 3); while (!av_isspace(*p) && *p != '\0') p++; while (av_isspace(*p))