Merge pull request phpredis#774 from CatKang/develop

michael-grunder · michael-grunder · commit 31b0531f8316 · 2016-03-28T11:35:43.000-07:00
Fix bug of unclosed socket stream in RedisCluster's construction
diff --git a/cluster_library.c b/cluster_library.c
@@ -922,6 +922,7 @@ cluster_map_keyspace(redisCluster *c TSRMLS_DC) {
         if(!mapped && slots) {
             memset(c->master, 0, sizeof(redisClusterNode*)*REDIS_CLUSTER_SLOTS);
         }
+        redis_sock_disconnect(*seed TSRMLS_CC);
     }
 
     // Clean up slots reply if we got one

Original file line number	Diff line number	Diff line change
`@@ -922,6 +922,7 @@ cluster_map_keyspace(redisCluster *c TSRMLS_DC) {`
`922`	`922`	`if(!mapped && slots) {`
`923`	`923`	`memset(c->master, 0, sizeof(redisClusterNode)REDIS_CLUSTER_SLOTS);`
`924`	`924`	`}`
	`925`	`+ redis_sock_disconnect(*seed TSRMLS_CC);`
`925`	`926`	`}`
`926`	`927`
`927`	`928`	`// Clean up slots reply if we got one`