diff options
| author | Jan Ekström <jeebjp@gmail.com> | 2020-05-13 00:31:03 +0300 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2020-09-04 19:04:55 +0300 |
| commit | 1e7b3851997f251685c0125efe95ebb2409d88ad (patch) | |
| tree | ae6bb270f480d74f6884587fe7d6d358b879c668 | |
| parent | 93d1993181abd67ec9f72dda2a390a1a4bb58c48 (diff) | |
| download | ffmpeg-1e7b3851997f251685c0125efe95ebb2409d88ad.tar.gz | |
avformat/tls_schannel: immediately return decrypted data if available
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)
| -rw-r--r-- | libavformat/tls_schannel.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/tls_schannel.c b/libavformat/tls_schannel.c index 7a8842e7fe..fec43ffafd 100644 --- a/libavformat/tls_schannel.c +++ b/libavformat/tls_schannel.c @@ -392,7 +392,12 @@ static int tls_read(URLContext *h, uint8_t *buf, int len) int size, ret; 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; if (c->sspi_close_notify) |