Unverified Commit 0f3c353d authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo Committed by GitHub
Browse files

Merge pull request #6715 from trevor211/fixPotentialClusterLinkError

Fix petential cluster link error.
parents f616ecf3 0992ada2
...@@ -2098,6 +2098,10 @@ static int updateMaxclients(long long val, long long prev, char **err) { ...@@ -2098,6 +2098,10 @@ static int updateMaxclients(long long val, long long prev, char **err) {
static char msg[128]; static char msg[128];
sprintf(msg, "The operating system is not able to handle the specified number of clients, try with %d", server.maxclients); sprintf(msg, "The operating system is not able to handle the specified number of clients, try with %d", server.maxclients);
*err = msg; *err = msg;
if (server.maxclients > prev) {
server.maxclients = prev;
adjustOpenFilesLimit();
}
return 0; return 0;
} }
if ((unsigned int) aeGetSetSize(server.el) < if ((unsigned int) aeGetSetSize(server.el) <
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment