[FFmpeg-cvslog] http: Reset compressed header flag when starting to read a request

Jacek Jendrzej git at videolan.org
Sat Nov 11 20:22:48 EET 2017


ffmpeg | branch: master | Jacek Jendrzej <satbaby at kawaii.com> | Thu Jul 20 13:46:46 2017 +0200| [9b1c0911146c0d7b4ede57ccfff6eac5b5304091] | committer: Martin Storsjö

http: Reset compressed header flag when starting to read a request

This fixes redirects, where the original redirect response indicated
support for compression, while the actual redirected content didn't.

Signed-off-by: Martin Storsjö <martin at martin.st>

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

 libavformat/http.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/http.c b/libavformat/http.c
index 00cf295001..80c87f786a 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -682,6 +682,9 @@ static int http_connect(URLContext *h, const char *path, const char *local_path,
     s->willclose        = 0;
     s->end_chunked_post = 0;
     s->end_header       = 0;
+#if CONFIG_ZLIB
+    s->compressed       = 0;
+#endif
     if (post && !s->post_data && !send_expect_100) {
         /* Pretend that it did work. We didn't read any header yet, since
          * we've still to send the POST data, but the code calling this



More information about the ffmpeg-cvslog mailing list