Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
89381980
Commit
89381980
authored
Oct 13, 2010
by
Pieter Noordhuis
Browse files
Remove disabling TCP with port -1
parent
5d10923f
Changes
3
Show whitespace changes
Inline
Side-by-side
redis.conf
View file @
89381980
...
@@ -21,7 +21,6 @@ daemonize no
...
@@ -21,7 +21,6 @@ daemonize no
pidfile
/
var
/
run
/
redis
.
pid
pidfile
/
var
/
run
/
redis
.
pid
# Accept connections on the specified port, default is 6379.
# Accept connections on the specified port, default is 6379.
# Use port -1 to disable listening on a network interface.
port
6379
port
6379
# If you want you can bind a single interface, if the bind option is not
# If you want you can bind a single interface, if the bind option is not
...
...
src/config.c
View file @
89381980
...
@@ -66,9 +66,7 @@ void loadServerConfig(char *filename) {
...
@@ -66,9 +66,7 @@ void loadServerConfig(char *filename) {
}
}
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"port"
)
&&
argc
==
2
)
{
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"port"
)
&&
argc
==
2
)
{
server
.
port
=
atoi
(
argv
[
1
]);
server
.
port
=
atoi
(
argv
[
1
]);
if
(
server
.
port
!=
-
1
&&
if
(
server
.
port
<
1
||
server
.
port
>
65535
)
{
(
server
.
port
<
1
||
server
.
port
>
65535
))
{
err
=
"Invalid port"
;
goto
loaderr
;
err
=
"Invalid port"
;
goto
loaderr
;
}
}
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"bind"
)
&&
argc
==
2
)
{
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"bind"
)
&&
argc
==
2
)
{
...
...
src/redis.c
View file @
89381980
...
@@ -776,13 +776,11 @@ void initServer() {
...
@@ -776,13 +776,11 @@ void initServer() {
createSharedObjects
();
createSharedObjects
();
server
.
el
=
aeCreateEventLoop
();
server
.
el
=
aeCreateEventLoop
();
server
.
db
=
zmalloc
(
sizeof
(
redisDb
)
*
server
.
dbnum
);
server
.
db
=
zmalloc
(
sizeof
(
redisDb
)
*
server
.
dbnum
);
if
(
server
.
port
>
0
)
{
server
.
ipfd
=
anetTcpServer
(
server
.
neterr
,
server
.
port
,
server
.
bindaddr
);
server
.
ipfd
=
anetTcpServer
(
server
.
neterr
,
server
.
port
,
server
.
bindaddr
);
if
(
server
.
ipfd
==
ANET_ERR
)
{
if
(
server
.
ipfd
==
ANET_ERR
)
{
redisLog
(
REDIS_WARNING
,
"Opening port: %s"
,
server
.
neterr
);
redisLog
(
REDIS_WARNING
,
"Opening port: %s"
,
server
.
neterr
);
exit
(
1
);
exit
(
1
);
}
}
}
if
(
server
.
unixsocket
!=
NULL
)
{
if
(
server
.
unixsocket
!=
NULL
)
{
unlink
(
server
.
unixsocket
);
/* don't care if this fails */
unlink
(
server
.
unixsocket
);
/* don't care if this fails */
server
.
sofd
=
anetUnixServer
(
server
.
neterr
,
server
.
unixsocket
);
server
.
sofd
=
anetUnixServer
(
server
.
neterr
,
server
.
unixsocket
);
...
...
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