From db7bd6fda9ec0ab942c49e0ec72b12e03d1345f6 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Thu, 11 Jan 2018 11:40:57 +0100
Subject: [PATCH] Document new protocol options in #4568 into redis.conf.

---
 redis.conf | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/redis.conf b/redis.conf
index 7eb692a8d..1e1f5313f 100644
--- a/redis.conf
+++ b/redis.conf
@@ -1156,6 +1156,20 @@ client-output-buffer-limit normal 0 0 0
 client-output-buffer-limit slave 256mb 64mb 60
 client-output-buffer-limit pubsub 32mb 8mb 60
 
+# Client query buffers accumulate new commands. They are limited to a fixed
+# amount by default in order to avoid that a protocol desynchronization (for
+# instance due to a bug in the client) will lead to unbound memory usage in
+# the query buffer. However you can configure it here if you have very special
+# needs, such us huge multi/exec requests or alike.
+#
+# client-query-buffer-limit 1gb
+
+# In the Redis protocol, bulk requests, that are, elements representing single
+# strings, are normally limited ot 512 mb. However you can change this limit
+# here.
+#
+# proto-max-bulk-len 512mb
+
 # Redis calls an internal function to perform many background tasks, like
 # closing connections of clients in timeout, purging expired keys that are
 # never requested, and so forth.