diff options
| author | Steven Liu <lingjiujianke@gmail.com> | 2016-09-16 10:42:34 +0800 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-09-17 13:48:34 +0200 |
| commit | 27714b462d1bff9e9b40fbdabb39f58e79032b81 (patch) | |
| tree | 730b9c38fe0b4654c47a0dc01786fbf099c8d5b1 /libavformat/http.c | |
| parent | 44bcb636c1a7052059330c3edbd900246e15ae60 (diff) | |
lavf/http: deprecate user-agent option
Diffstat (limited to 'libavformat/http.c')
| -rw-r--r-- | libavformat/http.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index adb3d92e21..5f6b9dea42 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -71,6 +71,9 @@ typedef struct HTTPContext { char *headers; char *mime_type; char *user_agent; +#ifdef FF_API_HTTP_USER_AGENT + char *user_agent_deprecated; +#endif char *content_type; /* Set if the server correctly handles Connection: close and will close * the connection after feeding us the content. */ @@ -131,7 +134,9 @@ static const AVOption options[] = { { "headers", "set custom HTTP headers, can override built in default headers", OFFSET(headers), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D | E }, { "content_type", "set a specific content type for the POST messages", OFFSET(content_type), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D | E }, { "user_agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, { .str = DEFAULT_USER_AGENT }, 0, 0, D }, - { "user-agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, { .str = DEFAULT_USER_AGENT }, 0, 0, D }, +#ifdef FF_API_HTTP_USER_AGENT + { "user-agent", "override User-Agent header", OFFSET(user_agent_deprecated), AV_OPT_TYPE_STRING, { .str = DEFAULT_USER_AGENT }, 0, 0, D }, +#endif { "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 }, @@ -1037,6 +1042,12 @@ static int http_connect(URLContext *h, const char *path, const char *local_path, send_expect_100 = 1; } +#ifdef FF_API_HTTP_USER_AGENT + if (strcmp(s->user_agent_deprecated, DEFAULT_USER_AGENT)) { + av_log(s, AV_LOG_WARNING, "the user-agent option is deprecated, please use user_agent option\n"); + s->user_agent = av_strdup(s->user_agent_deprecated); + } +#endif /* set default headers if needed */ if (!has_header(s->headers, "\r\nUser-Agent: ")) len += av_strlcatf(headers + len, sizeof(headers) - len, |