Merge branch '2.4' of github.com:antirez/redis into 2.4

This commit is contained in:
antirez 2011-05-01 15:42:53 +02:00
commit d275513b04

View File

@ -527,10 +527,16 @@ void freeClient(redisClient *c) {
* close the connection with all our slaves if we have any, so * close the connection with all our slaves if we have any, so
* when we'll resync with the master the other slaves will sync again * when we'll resync with the master the other slaves will sync again
* with us as well. Note that also when the slave is not connected * with us as well. Note that also when the slave is not connected
* to the master it will keep refusing connections by other slaves. */ * to the master it will keep refusing connections by other slaves.
while (listLength(server.slaves)) { *
ln = listFirst(server.slaves); * We do this only if server.masterhost != NULL. If it is NULL this
freeClient((redisClient*)ln->value); * means the user called SLAVEOF NO ONE and we are freeing our
* link with the master, so no need to close link with slaves. */
if (server.masterhost != NULL) {
while (listLength(server.slaves)) {
ln = listFirst(server.slaves);
freeClient((redisClient*)ln->value);
}
} }
} }
/* Release memory */ /* Release memory */