diff options
| author | Oran Agra <oran@redislabs.com> | 2022-04-27 16:32:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-27 16:32:17 +0300 |
| commit | d375595d5e3ae2e5c29e6c00a2dc3d60578fd9fc (patch) | |
| tree | c4d753d3ee0109e3513a879af8c5487e002d10a3 /src/timeout.c | |
| parent | fb4e0d400ff82117104bde5296c477ad95f8dd41 (diff) | |
| parent | c1f3020631ea8640f2b6aa666a245dd76635a807 (diff) | |
| download | redis-7.0.0.tar.gz | |
Merge pull request #10652 from oranagra/redis-7.0.07.0.0
Redis 7.0.0
Diffstat (limited to 'src/timeout.c')
| -rw-r--r-- | src/timeout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/timeout.c b/src/timeout.c index d4c4690e5..36cea7c26 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -58,7 +58,7 @@ int clientsCronHandleTimeout(client *c, mstime_t now_ms) { if (server.maxidletime && /* This handles the idle clients connection timeout if set. */ !(c->flags & CLIENT_SLAVE) && /* No timeout for slaves and monitors */ - !(c->flags & CLIENT_MASTER) && /* No timeout for masters */ + !mustObeyClient(c) && /* No timeout for masters and AOF */ !(c->flags & CLIENT_BLOCKED) && /* No timeout for BLPOP */ !(c->flags & CLIENT_PUBSUB) && /* No timeout for Pub/Sub clients */ (now - c->lastinteraction > server.maxidletime)) |