client libraries synched in git

[redis.git] / redis.conf

diff --git a/redis.conf b/redis.conf
index 38592b02e6bc3c49c44fd717f4604d475456950f..09f926d7b62a5797547a8dbad320627ce9aa9016 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -16,7 +16,7 @@ port 6379
 #
 # bind 127.0.0.1
 
-# Close the connection after a client is idle for N seconds
+# Close the connection after a client is idle for N seconds (0 to disable)
 timeout 300
 
 # Save the DB on disk:
@@ -78,6 +78,16 @@ databases 16
 
 # requirepass foobared
 
+################################### LIMITS ####################################
+
+# Set the max number of connected clients at the same time. By default there
+# is no limit, and it's up to the number of file descriptors the Redis process
+# is able to open. The special value '0' means no limts.
+# Once the limit is reached Redis will close all the new connections sending
+# an error 'max number of clients reached'.
+
+# maxclients 128
+
 ############################### ADVANCED CONFIG ###############################
 
 # Glue small output buffers together in order to send small replies in a