[FFmpeg-devel,1/3] avformat/http: fix chunked response w/ multiple_requests=1

Submitted by Aman Gupta on Oct. 4, 2017, 10:03 p.m.

Details

Message ID 20171004220334.79264-1-ffmpeg@tmm1.net
State New
Headers show

Commit Message

Aman Gupta Oct. 4, 2017, 10:03 p.m.
From: Aman Gupta <aman@tmm1.net>

Currently if you use the multiple_requests=1 option and try to receive a
chunked-encoded response, http_buf_read() will hang forever.

After this patch, EOF is emulated once a 0-byte final chunk is
received. This bheavior is reset in ff_http_do_new_request(), which is
used to make additional requests on the open socket.
---
 libavformat/http.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/libavformat/http.c b/libavformat/http.c
index 668cd51986..6af3259a43 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -66,6 +66,7 @@  typedef struct HTTPContext {
     int http_code;
     /* Used if "Transfer-Encoding: chunked" otherwise -1. */
     uint64_t chunksize;
+    int chunkend;
     uint64_t off, end_off, filesize;
     char *location;
     HTTPAuthState auth_state;
@@ -305,6 +306,7 @@  int ff_http_do_new_request(URLContext *h, const char *uri)
     AVDictionary *options = NULL;
     int ret;
 
+    s->chunkend      = 0;
     s->off           = 0;
     s->icy_data_read = 0;
     av_free(s->location);
@@ -1281,6 +1283,9 @@  static int http_buf_read(URLContext *h, uint8_t *buf, int size)
     int len;
 
     if (s->chunksize != UINT64_MAX) {
+        if (s->chunkend) {
+            return 0;
+        }
         if (!s->chunksize) {
             char line[32];
             int err;
@@ -1296,8 +1301,11 @@  static int http_buf_read(URLContext *h, uint8_t *buf, int size)
                    "Chunked encoding data size: %"PRIu64"'\n",
                     s->chunksize);
 
-            if (!s->chunksize)
+            if (!s->chunksize) {
+                http_get_line(s, line, sizeof(line)); // read empty chunk
+                s->chunkend = 1;
                 return 0;
+            }
             else if (s->chunksize == UINT64_MAX) {
                 av_log(h, AV_LOG_ERROR, "Invalid chunk size %"PRIu64"\n",
                        s->chunksize);