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

http: Improve handling of Content-Range with Transfer-Encoding:chunked 

When Transfer-Encoding:chunked is used, the client must ignore a
Content-Length header, if present. However, it should not ignore a
Content-Range header, which also includes the full size of the
entity.
This commit is contained in:
Justin Ruggles 2022-02-02 10:39:07 -05:00 committed by Vittorio Giovara
parent 402784ba9f
commit c1228315c9
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/http.c
View File

@ -132,6 +132,7 @@ typedef struct HTTPContext {
int64_t expires;
char *new_location;
AVDictionary *redirect_cache;
uint64_t filesize_from_content_range;
} HTTPContext;
#define OFFSET(x) offsetof(HTTPContext, x)
@ -839,7 +840,7 @@ static void parse_content_range(URLContext *h, const char *p)
p += 6;
s->off = strtoull(p, NULL, 10);
if ((slash = strchr(p, '/')) && strlen(slash) > 0)
s->filesize = strtoull(slash + 1, NULL, 10);
s->filesize_from_content_range = strtoull(slash + 1, NULL, 10);
}
if (s->seekable == -1 && (!s->is_akamai || s->filesize != 2147483647))
h->is_streamed = 0; /* we _can_ in fact seek */
@ -1341,6 +1342,7 @@ static int http_read_header(URLContext *h)
av_freep(&s->new_location);
s->expires = 0;
s->chunksize = UINT64_MAX;
s->filesize_from_content_range = UINT64_MAX;
for (;;) {
if ((err = http_get_line(s, line, sizeof(line))) < 0)
@ -1356,6 +1358,10 @@ static int http_read_header(URLContext *h)
s->line_count++;
}
// filesize from Content-Range can always be used, even if using chunked Transfer-Encoding
if (s->filesize_from_content_range != UINT64_MAX)
s->filesize = s->filesize_from_content_range;
if (s->seekable == -1 && s->is_mediagateway && s->filesize == 2000000000)
h->is_streamed = 1; /* we can in fact _not_ seek */