Commit e8b355a0 authored by Moritz Barsnick's avatar Moritz Barsnick Committed by Michael Niedermayer

libavformat/http: add support for headers option in listen mode

Instead of silently ignoring the headers option in listen mode, use
the provided headers.
Signed-off-by: 's avatarMoritz Barsnick <barsnick@gmx.net>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 17eb0042
...@@ -371,12 +371,14 @@ static int http_write_reply(URLContext* h, int status_code) ...@@ -371,12 +371,14 @@ static int http_write_reply(URLContext* h, int status_code)
"HTTP/1.1 %03d %s\r\n" "HTTP/1.1 %03d %s\r\n"
"Content-Type: %s\r\n" "Content-Type: %s\r\n"
"Content-Length: %"SIZE_SPECIFIER"\r\n" "Content-Length: %"SIZE_SPECIFIER"\r\n"
"%s"
"\r\n" "\r\n"
"%03d %s\r\n", "%03d %s\r\n",
reply_code, reply_code,
reply_text, reply_text,
content_type, content_type,
strlen(reply_text) + 6, // 3 digit status code + space + \r\n strlen(reply_text) + 6, // 3 digit status code + space + \r\n
s->headers ? s->headers : "",
reply_code, reply_code,
reply_text); reply_text);
} else { } else {
...@@ -385,10 +387,12 @@ static int http_write_reply(URLContext* h, int status_code) ...@@ -385,10 +387,12 @@ static int http_write_reply(URLContext* h, int status_code)
"HTTP/1.1 %03d %s\r\n" "HTTP/1.1 %03d %s\r\n"
"Content-Type: %s\r\n" "Content-Type: %s\r\n"
"Transfer-Encoding: chunked\r\n" "Transfer-Encoding: chunked\r\n"
"%s"
"\r\n", "\r\n",
reply_code, reply_code,
reply_text, reply_text,
content_type); content_type,
s->headers ? s->headers : "");
} }
av_log(h, AV_LOG_TRACE, "HTTP reply header: \n%s----\n", message); av_log(h, AV_LOG_TRACE, "HTTP reply header: \n%s----\n", message);
if ((ret = ffurl_write(s->hd, message, message_len)) < 0) if ((ret = ffurl_write(s->hd, message, message_len)) < 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment