diff options
| author | Moritz Barsnick <barsnick@gmx.net> | 2016-08-11 11:29:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-12 00:20:26 +0200 |
| commit | e8b355a0288ce8f575cc12cce7e7b7b0dae62525 (patch) | |
| tree | b9aef15663e8f76811abb986655634a8af6213f5 /libavformat | |
| parent | 17eb0042bcf2c0ba2957b3fe9d7b7fe40ce250ac (diff) | |
| download | ffmpeg-e8b355a0288ce8f575cc12cce7e7b7b0dae62525.tar.gz | |
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: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/http.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index 51275d9960..cb5824fabd 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -371,12 +371,14 @@ static int http_write_reply(URLContext* h, int status_code) "HTTP/1.1 %03d %s\r\n" "Content-Type: %s\r\n" "Content-Length: %"SIZE_SPECIFIER"\r\n" + "%s" "\r\n" "%03d %s\r\n", reply_code, reply_text, content_type, strlen(reply_text) + 6, // 3 digit status code + space + \r\n + s->headers ? s->headers : "", reply_code, reply_text); } else { @@ -385,10 +387,12 @@ static int http_write_reply(URLContext* h, int status_code) "HTTP/1.1 %03d %s\r\n" "Content-Type: %s\r\n" "Transfer-Encoding: chunked\r\n" + "%s" "\r\n", reply_code, reply_text, - content_type); + content_type, + s->headers ? s->headers : ""); } av_log(h, AV_LOG_TRACE, "HTTP reply header: \n%s----\n", message); if ((ret = ffurl_write(s->hd, message, message_len)) < 0) |