Merge remote-tracking branch 'origin/unstable' into unstable

[redis.git] / src / networking.c

diff --git a/src/networking.c b/src/networking.c
index f1c6627ce7e356311539397a83b8394b9a35b9e8..59512f0ff76260d271b78138d07b82440a5cd5fb 100644 (file)
--- a/src/networking.c
+++ b/src/networking.c
@@ -519,7 +519,7 @@ void freeClient(redisClient *c) {
     /* Case 2: we lost the connection with the master. */
     if (c->flags & REDIS_MASTER) {
         server.master = NULL;
-        server.replstate = REDIS_REPL_CONNECT;
+        server.repl_state = REDIS_REPL_CONNECT;
         server.repl_down_since = time(NULL);
         /* Since we lost the connection with the master, we should also
          * close the connection with all our slaves if we have any, so
@@ -997,8 +997,12 @@ sds getAllClientsInfoString(void) {
 
     listRewind(server.clients,&li);
     while ((ln = listNext(&li)) != NULL) {
+        sds cs;
+
         client = listNodeValue(ln);
-        o = sdscatsds(o,getClientInfoString(client));
+        cs = getClientInfoString(client);
+        o = sdscatsds(o,cs);
+        sdsfree(cs);
         o = sdscatlen(o,"\n",1);
     }
     return o;