fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-31 14:51:04 +00:00
Code Issues Projects Releases Wiki Activity

CLIENT KILL: fix closing link of the current client.

Browse Source
This commit is contained in:
antirez 2014-06-16 14:28:23 +02:00
parent e7affd266c
commit e06b3819ea
1 changed files with 6 additions and 1 deletions

7
src/networking.c

@ -1357,6 +1357,7 @@ void clientCommand(redisClient *c) {
int type = -1; int type = -1;
uint64_t id = 0; uint64_t id = 0;
int killed = 0; int killed = 0;
int close_this_client = 0;
/* Parse arguments. */ /* Parse arguments. */
if (c->argc == 3) { if (c->argc == 3) {
@ -1396,7 +1397,7 @@ void clientCommand(redisClient *c) {
/* Kill it. */ /* Kill it. */
if (c == client) { if (c == client) {
client->flags |= REDIS_CLOSE_AFTER_REPLY; close_this_client = 1;
} else { } else {
freeClient(client); freeClient(client);
} }
@ -1412,6 +1413,10 @@ void clientCommand(redisClient *c) {
} else { } else {
addReplyLongLong(c,killed); addReplyLongLong(c,killed);
} }
/* If this client has to be closed, flag it as CLOSE_AFTER_REPLY
* only after we queued the reply to its output buffers. */
if (close_this_client) c->flags |= REDIS_CLOSE_AFTER_REPLY;
} else if (!strcasecmp(c->argv[1]->ptr,"setname") && c->argc == 3) { } else if (!strcasecmp(c->argv[1]->ptr,"setname") && c->argc == 3) {
int j, len = sdslen(c->argv[2]->ptr); int j, len = sdslen(c->argv[2]->ptr);
char *p = c->argv[2]->ptr; char *p = c->argv[2]->ptr;