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
35a977c4
Commit
35a977c4
authored
Aug 21, 2013
by
antirez
Browse files
Fix for issue #1214 simplified.
parent
038e356d
Changes
1
Show whitespace changes
Inline
Side-by-side
src/redis.c
View file @
35a977c4
...
@@ -1476,7 +1476,6 @@ void adjustOpenFilesLimit(void) {
...
@@ -1476,7 +1476,6 @@ void adjustOpenFilesLimit(void) {
void initServer() {
void initServer() {
int j;
int j;
int
ip_count
;
signal(SIGHUP, SIG_IGN);
signal(SIGHUP, SIG_IGN);
signal(SIGPIPE, SIG_IGN);
signal(SIGPIPE, SIG_IGN);
...
@@ -1508,19 +1507,18 @@ void initServer() {
...
@@ -1508,19 +1507,18 @@ void initServer() {
if (server.bindaddr_count == 0) server.bindaddr[0] = NULL;
if (server.bindaddr_count == 0) server.bindaddr[0] = NULL;
for (j = 0; j < server.bindaddr_count || j == 0; j++) {
for (j = 0; j < server.bindaddr_count || j == 0; j++) {
if (server.bindaddr[j] == NULL) {
if (server.bindaddr[j] == NULL) {
/* Bind * for both IPv6 and IPv4.
/* Bind * for both IPv6 and IPv4, we enter here only if
* Should consider that someone only has IPV6 and someone only get IPV4 */
* server.bindaddr_count == 0, so we try to bind and then
ip_count
=
0
;
* break to exit the loop ASAP. */
server
.
ipfd
[
ip_count
]
=
anetTcp6Server
(
server
.
neterr
,
server
.
port
,
NULL
);
server.ipfd[server.ipfd_count] =
if
(
server
.
ipfd
[
ip_count
]
!=
ANET_ERR
)
ip_count
++
;
anetTcp6Server(server.neterr,server.port,NULL);
if (server.ipfd[server.ipfd_count] != ANET_ERR)
server
.
ipfd
[
ip_count
]
=
anetTcpServer
(
server
.
neterr
,
server
.
port
,
NULL
);
server.ipfd_count++;
if
(
server
.
ipfd
[
ip_count
]
!=
ANET_ERR
)
ip_count
++
;
server.ipfd[server.ipfd_count] =
anetTcpServer(server.neterr,server.port,NULL);
/* It should be ip_count plus one
if(server.ipfd[server.ipfd_count] != ANET_ERR)
* because out of this branch, the server.ipfd_count would increase */
server.ipfd_count++;
server
.
ipfd_count
+=
(
ip_count
-
1
);
break;
} else if (strchr(server.bindaddr[j],':')) {
} else if (strchr(server.bindaddr[j],':')) {
/* Bind IPv6 address. */
/* Bind IPv6 address. */
server.ipfd[server.ipfd_count] = anetTcp6Server(server.neterr,server.port,server.bindaddr[j]);
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