Remove disabling TCP with port -1

diff --git a/redis.conf b/redis.conf
index a01bdd1566e93e91f73494b57c7b1685b62260cc..3a2b45e23ee8bee0ae6cf256908b3186d95a4da5 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -21,7 +21,6 @@ daemonize no
 pidfile /var/run/redis.pid
 
 # Accept connections on the specified port, default is 6379.
 pidfile /var/run/redis.pid
 
 # Accept connections on the specified port, default is 6379.

-# Use port -1 to disable listening on a network interface.

 port 6379
 
 # If you want you can bind a single interface, if the bind option is not
 port 6379
 
 # If you want you can bind a single interface, if the bind option is not

diff --git a/src/config.c b/src/config.c
index 6b281a14289a6583a1ecdbccde3f72e2617cf66f..eeec9e8c6e0d51ac08cec46dc6e8dc1cc053a798 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -66,9 +66,7 @@ void loadServerConfig(char *filename) {
             }
         } else if (!strcasecmp(argv[0],"port") && argc == 2) {
             server.port = atoi(argv[1]);
             }
         } else if (!strcasecmp(argv[0],"port") && argc == 2) {
             server.port = atoi(argv[1]);

-            if (server.port != -1 &&
-                (server.port < 1 || server.port > 65535))
-            {
+            if (server.port < 1 || server.port > 65535) {

                 err = "Invalid port"; goto loaderr;
             }
         } else if (!strcasecmp(argv[0],"bind") && argc == 2) {
                 err = "Invalid port"; goto loaderr;
             }
         } else if (!strcasecmp(argv[0],"bind") && argc == 2) {

diff --git a/src/redis.c b/src/redis.c
index 0c3d0ce924037b1637fff610f5114e2143439d52..8bff97b51df105d30741adb5cb6d2507ffc3c20e 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -776,12 +776,10 @@ void initServer() {
     createSharedObjects();
     server.el = aeCreateEventLoop();
     server.db = zmalloc(sizeof(redisDb)*server.dbnum);
     createSharedObjects();
     server.el = aeCreateEventLoop();
     server.db = zmalloc(sizeof(redisDb)*server.dbnum);

-    if (server.port > 0) {
-        server.ipfd = anetTcpServer(server.neterr,server.port,server.bindaddr);
-        if (server.ipfd == ANET_ERR) {
-            redisLog(REDIS_WARNING, "Opening port: %s", server.neterr);
-            exit(1);
-        }
+    server.ipfd = anetTcpServer(server.neterr,server.port,server.bindaddr);
+    if (server.ipfd == ANET_ERR) {
+        redisLog(REDIS_WARNING, "Opening port: %s", server.neterr);
+        exit(1);

     }
     if (server.unixsocket != NULL) {
         unlink(server.unixsocket); /* don't care if this fails */
     }
     if (server.unixsocket != NULL) {
         unlink(server.unixsocket); /* don't care if this fails */