RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '5ae178539b91d25710b7bb322d156c31aea9f8bf' 

* commit '5ae178539b91d25710b7bb322d156c31aea9f8bf':
  http: Add the trailing endlines if they are missing

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-30 16:23:09 +02:00
parent 77d8fd5c9c 5ae178539b
commit 8e67599505
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/http.c
View File

@ -368,9 +368,16 @@ static int http_open(URLContext *h, const char *uri, int flags,
if (s->headers) { if (s->headers) {
int len = strlen(s->headers); int len = strlen(s->headers);
if (len < 2 || strcmp("\r\n", s->headers + len - 2)) if (len < 2 || strcmp("\r\n", s->headers + len - 2)) {
av_log(h, AV_LOG_WARNING, av_log(h, AV_LOG_WARNING,
"No trailing CRLF found in HTTP header.\n"); "No trailing CRLF found in HTTP header.\n");
ret = av_reallocp(&s->headers, len + 3);
if (ret < 0)
return ret;
s->headers[len] = '\r';
s->headers[len + 1] = '\n';
s->headers[len + 2] = '\0';
}
} }
if (s->listen) { if (s->listen) {