Merge branch 'gopher' into unstable

This commit is contained in:
antirez
2019-02-25 18:16:58 +01:00
7 changed files with 174 additions and 1 deletions

View File

@ -2222,6 +2222,7 @@ void initServerConfig(void) {
server.ipfd_count = 0;
server.sofd = -1;
server.protected_mode = CONFIG_DEFAULT_PROTECTED_MODE;
server.gopher_enabled = CONFIG_DEFAULT_GOPHER_ENABLED;
server.dbnum = CONFIG_DEFAULT_DBNUM;
server.verbosity = CONFIG_DEFAULT_VERBOSITY;
server.maxidletime = CONFIG_DEFAULT_CLIENT_TIMEOUT;