virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avformat/tls_schannel: immediately return decrypted data if available

Browse Source 
Until now, we would have only attempted to utilize already decrypted
data if it was enough to fill the size of buffer requested, that could
very well be up to 32 kilobytes.

With keep-alive connections this would just lead to recv blocking
until rw_timeout had been reached, as the connection would not be
officially closed after each transfer. This would also lead to a
loop, as such timed out I/O request would just be attempted again.

By just returning the available decrypted data, keep-alive based
connectivity such as HLS playback is fixed with schannel.

(cherry picked from commit 6f8826e4aaddf1ee6cf3f333ed0e392a748382fe)
This commit is contained in:
Jan Ekström 2020-05-13 00:31:03 +03:00
parent 217f75f553
commit f0fc6dd272
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/tls_schannel.c
View File

@ -392,7 +392,12 @@ static int tls_read(URLContext *h, uint8_t *buf, int len)
int size, ret; int size, ret;
int min_enc_buf_size = len + SCHANNEL_FREE_BUFFER_SIZE; int min_enc_buf_size = len + SCHANNEL_FREE_BUFFER_SIZE;
if (len <= c->dec_buf_offset) /* If we have some left-over data from previous network activity,
* return it first in case it is enough. It may contain
* data that is required to know whether this connection
* is still required or not, esp. in case of HTTP keep-alive
* connections. */
if (c->dec_buf_offset > 0)
goto cleanup; goto cleanup;
if (c->sspi_close_notify) if (c->sspi_close_notify)