[FFmpeg-cvslog] http: Add the trailing endlines if they are missing

Luca Barbato git at videolan.org
Thu Jul 30 16:34:25 CEST 2015


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Thu Jul 23 21:14:09 2015 +0200| [5ae178539b91d25710b7bb322d156c31aea9f8bf] | committer: Luca Barbato

http: Add the trailing endlines if they are missing

Makes slightly easier the life of those want to use the option
from the command line

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ae178539b91d25710b7bb322d156c31aea9f8bf
---

 libavformat/http.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libavformat/http.c b/libavformat/http.c
index 3b9aa2d..b3e9771 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -287,9 +287,16 @@ static int http_open(URLContext *h, const char *uri, int flags,
 
     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';
+        }
     }
 
     ret = http_open_cnx(h, options);



More information about the ffmpeg-cvslog mailing list