Merge commit '5ae178539b91d25710b7bb322d156c31aea9f8bf'

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

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

diff --cc libavformat/http.c
index 676bfd5c5a869c8f16b968f1af44fb974fd4fbd1,b3e9771757358f822b18ff00da899aca5f9bb231..684058147aec9c0b60ecf84a6394630612d8dcd0
--- 1/libavformat/http.c
--- 2/libavformat/http.c
+++ b/libavformat/http.c
@@@ -368,14 -287,18 +368,21 @@@ static int http_open(URLContext *h, con
  
      if (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,
                     "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) {
 +        return http_listen(h, uri, flags, options);
 +    }
      ret = http_open_cnx(h, options);
      if (ret < 0)
          av_dict_free(&s->chained_options);