har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/http: return EOF from ff_http_do_new_request if previous response said Connection:close

Browse Source 
This fixes a deadlock when using the hls demuxer's new http_persistent feature
to stream a youtube live stream over HTTPS. The youtube servers are http/1.1
compliant, but return a "Connecton: close". Before this commit, the demuxer
would attempt to send a new request on the partially shutdown connection and
cause a deadlock in the tls protocol.

Signed-off-by: Aman Gupta <aman@tmm1.net>
This commit is contained in:
Aman Gupta 2017-12-22 16:29:41 -08:00
parent 1f0eaa02aa
commit 54d0ef1738
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/http.c
View File

@ -327,6 +327,9 @@ int ff_http_do_new_request(URLContext *h, const char *uri)
if (ret < 0) if (ret < 0)
return ret; return ret;
if (s->willclose)
return AVERROR_EOF;
s->end_chunked_post = 0; s->end_chunked_post = 0;
s->chunkend = 0; s->chunkend = 0;
s->off = 0; s->off = 0;