未验证 提交 74a203a0 编写于 作者: S Salvatore Sanfilippo 提交者: GitHub

Merge pull request #7352 from soloestoy/donot-free-protected-client-when-blocking

donot free protected client in freeClientsInAsyncFreeQueue()
...@@ -1239,14 +1239,20 @@ void freeClientAsync(client *c) { ...@@ -1239,14 +1239,20 @@ void freeClientAsync(client *c) {
/* Free the clietns marked as CLOSE_ASAP, return the number of clients /* Free the clietns marked as CLOSE_ASAP, return the number of clients
* freed. */ * freed. */
int freeClientsInAsyncFreeQueue(void) { int freeClientsInAsyncFreeQueue(void) {
int freed = listLength(server.clients_to_close); int freed = 0;
while (listLength(server.clients_to_close)) { listIter li;
listNode *ln = listFirst(server.clients_to_close); listNode *ln;
listRewind(server.clients_to_close,&li);
while ((ln = listNext(&li)) != NULL) {
client *c = listNodeValue(ln); client *c = listNodeValue(ln);
if (c->flags & CLIENT_PROTECTED) continue;
c->flags &= ~CLIENT_CLOSE_ASAP; c->flags &= ~CLIENT_CLOSE_ASAP;
freeClient(c); freeClient(c);
listDelNode(server.clients_to_close,ln); listDelNode(server.clients_to_close,ln);
freed++;
} }
return freed; return freed;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册