Skip to content

Fix TLS infinite busy loop when write/read handlers are removed #3510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yairgott wants to merge 5 commits into
base: unstable
Choose a base branch
from
+8 −6
Open

Fix TLS infinite busy loop when write/read handlers are removed #3510

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b99a20
Fix TLS infinite busy loop when write/read handlers are removed
Apr 15, 2026
06ed363
Fix TLS infinite busy loop when write/read handlers are removed
Apr 15, 2026
56d76b6
Merge branch 'tls_want_wait_fix' of github.com:yairgott/valkey into t…
Apr 15, 2026
901bd64
updating logic
Apr 20, 2026
f27301b
removing not working tcl
Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/tls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1236,8 +1236,8 @@ static void updateSSLEvent(tls_connection *conn) {
if (conn->flags & TLS_CONN_FLAG_POSTPONE_UPDATE_STATE) return;

int mask = aeGetFileEvents(server.el, conn->c.fd);
int need_read = conn->c.read_handler || (conn->flags & TLS_CONN_FLAG_WRITE_WANT_READ);
int need_write = conn->c.write_handler || (conn->flags & TLS_CONN_FLAG_READ_WANT_WRITE);
int need_read = conn->c.read_handler || (conn->c.write_handler && (conn->flags & TLS_CONN_FLAG_WRITE_WANT_READ));
int need_write = conn->c.write_handler || (conn->c.read_handler && (conn->flags & TLS_CONN_FLAG_READ_WANT_WRITE));

if (need_read && !(mask & AE_READABLE))
aeCreateFileEvent(server.el, conn->c.fd, AE_READABLE, tlsEventHandler, conn);
Expand Down Expand Up @@ -1444,10 +1444,12 @@ static void tlsHandleEvent(tls_connection *conn, int mask) {
if (connTLSAccept((connection *)conn, NULL) == C_ERR || conn->c.state != CONN_STATE_CONNECTED) return;
break;
case CONN_STATE_CONNECTED: {
int call_read = ((mask & AE_READABLE) && conn->c.read_handler) ||
((mask & AE_WRITABLE) && (conn->flags & TLS_CONN_FLAG_READ_WANT_WRITE));
int call_write = ((mask & AE_WRITABLE) && conn->c.write_handler) ||
((mask & AE_READABLE) && (conn->flags & TLS_CONN_FLAG_WRITE_WANT_READ));
int call_read = conn->c.read_handler &&
((mask & AE_READABLE) ||
((mask & AE_WRITABLE) && (conn->flags & TLS_CONN_FLAG_READ_WANT_WRITE)));
int call_write = conn->c.write_handler &&
((mask & AE_WRITABLE) ||
((mask & AE_READABLE) && (conn->flags & TLS_CONN_FLAG_WRITE_WANT_READ)));

/* Normally we execute the readable event first, and the writable
* event laster. This is useful as sometimes we may be able
Expand Down
Loading