Merge branch 'tls-fix-readpaused-usage' into 'main'
TLS: do not ignore readpaused flag in certain circumstances See merge request isc-projects/bind9!6627
This commit is contained in:
@@ -492,6 +492,13 @@ tls_do_bio(isc_nmsocket_t *sock, isc_region_t *received_data,
|
||||
if (sock->statichandle == NULL) {
|
||||
finish = true;
|
||||
break;
|
||||
} else if (atomic_load(&sock->readpaused)) {
|
||||
/*
|
||||
* Reading has been paused from withing
|
||||
* the context of read callback - stop
|
||||
* processing incoming data.
|
||||
*/
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -542,11 +549,9 @@ tls_do_bio(isc_nmsocket_t *sock, isc_region_t *received_data,
|
||||
}
|
||||
return;
|
||||
case SSL_ERROR_WANT_READ:
|
||||
if (tls_try_to_close_unused_socket(sock)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (sock->outerhandle == NULL) {
|
||||
if (tls_try_to_close_unused_socket(sock) ||
|
||||
sock->outerhandle == NULL || atomic_load(&sock->readpaused))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user