diff options
author | Allan <kaoshi.juan@163.com> | 2013-07-24 21:34:55 +0800 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2013-08-21 11:41:21 +0200 |
commit | 0a4656d63f90fa6bd2f3bbb488eaaaf752ed1d83 (patch) | |
tree | dfa588b48d3fc4154b14672bf0a0d60b7fd9c302 | |
parent | 7c861340b157a19649ccda55137fa2dfa628fa87 (diff) | |
download | redis-0a4656d63f90fa6bd2f3bbb488eaaaf752ed1d83.tar.gz |
fixed bug issue of #1213
-rw-r--r-- | src/redis.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/redis.c b/src/redis.c index 0696c8ee3..bdfe607a3 100644 --- a/src/redis.c +++ b/src/redis.c @@ -1468,9 +1468,12 @@ void initServer() { for (j = 0; j < server.bindaddr_count || j == 0; j++) { if (server.bindaddr[j] == NULL) { /* Bind * for both IPv6 and IPv4. */ - server.ipfd[0] = anetTcp6Server(server.neterr,server.port,NULL); - if (server.ipfd[0] != ANET_ERR) server.ipfd_count++; - server.ipfd[1] = anetTcpServer(server.neterr,server.port,NULL); + server.ipfd[server.ipfd_count] = anetTcp6Server(server.neterr,server.port,NULL); + if (server.ipfd[server.ipfd_count] != ANET_ERR) server.ipfd_count++; + + server.ipfd[server.ipfd_count] = anetTcpServer(server.neterr,server.port,NULL); + + } else if (strchr(server.bindaddr[j],':')) { /* Bind IPv6 address. */ server.ipfd[server.ipfd_count] = anetTcp6Server(server.neterr,server.port,server.bindaddr[j]); |