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 by setting a new flag. This flag is reset in ff_http_do_new_request(),
which is used to make additional requests on the open socket.
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Aman Gupta <aman@tmm1.net>
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;
AVDictionary *options = NULL;
int ret;
+ s->chunkend = 0;
s->off = 0;
s->icy_data_read = 0;
av_free(s->location);
int len;
if (s->chunksize != UINT64_MAX) {
+ if (s->chunkend) {
+ return AVERROR_EOF;
+ }
if (!s->chunksize) {
char line[32];
int err;
"Chunked encoding data size: %"PRIu64"\n",
s->chunksize);
- if (!s->chunksize) {
+ if (!s->chunksize && s->multiple_requests) {
+ http_get_line(s, line, sizeof(line)); // read empty chunk
+ s->chunkend = 1;
+ return 0;
+ }
+ else if (!s->chunksize) {
av_log(h, AV_LOG_DEBUG, "Last chunk received, closing conn\n");
ffurl_closep(&s->hd);
return 0;