Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
038e356d
Commit
038e356d
authored
Aug 21, 2013
by
Salvatore Sanfilippo
Browse files
Merge pull request #1214 from kaoshijuan/unstable
fixed initServer fail problem
parents
7e9929e1
a0e986d7
Changes
1
Show whitespace changes
Inline
Side-by-side
src/redis.c
View file @
038e356d
...
...
@@ -1476,6 +1476,7 @@ void adjustOpenFilesLimit(void) {
void initServer() {
int j;
int ip_count;
signal(SIGHUP, SIG_IGN);
signal(SIGPIPE, SIG_IGN);
...
...
@@ -1507,10 +1508,19 @@ void initServer() {
if (server.bindaddr_count == 0) server.bindaddr[0] = NULL;
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
);
/* Bind * for both IPv6 and IPv4.
* Should consider that someone only has IPV6 and someone only get IPV4 */
ip_count = 0;
server.ipfd[ip_count] = anetTcp6Server(server.neterr,server.port,NULL);
if (server.ipfd[ip_count] != ANET_ERR) ip_count++;
server.ipfd[ip_count] = anetTcpServer(server.neterr,server.port,NULL);
if(server.ipfd[ip_count] != ANET_ERR ) ip_count++;
/* It should be ip_count plus one
* because out of this branch, the server.ipfd_count would increase */
server.ipfd_count += (ip_count - 1);
} else if (strchr(server.bindaddr[j],':')) {
/* Bind IPv6 address. */
server.ipfd[server.ipfd_count] = anetTcp6Server(server.neterr,server.port,server.bindaddr[j]);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment