Merge remote-tracking branch 'upstream/unstable' into tls

This commit is contained in:
Yossi Gottlieb
2019-10-16 17:08:07 +03:00
61 changed files with 2628 additions and 425 deletions

View File

@ -2046,7 +2046,7 @@ NULL
return;
}
sds o = getAllClientsInfoString(type);
addReplyBulkCBuffer(c,o,sdslen(o));
addReplyVerbatim(c,o,sdslen(o),"txt");
sdsfree(o);
} else if (!strcasecmp(c->argv[1]->ptr,"reply") && c->argc == 3) {
/* CLIENT REPLY ON|OFF|SKIP */