[4.1] 9653490 Revert DEPRECATED mark on cli_buffer

PÃ¥l Hermunn Johansen hermunn at varnish-software.com
Mon Nov 6 12:50:07 UTC 2017


commit 96534906297fb8440b866188996d707e6b783cb7
Author: Pål Hermunn Johansen <hermunn at varnish-software.com>
Date:   Mon Nov 6 13:43:36 2017 +0100

    Revert DEPRECATED mark on cli_buffer
    
    The commit 01fa472647fe431d09f4873f5d0cefe8b9b88919 did not in fact
    remove the effect of the cli_buffer value, but it did prevent varnish
    from crashing when setting the parameter very high. This reverts the
    change in the documentation.

diff --git a/doc/changes.rst b/doc/changes.rst
index 558be47..bfd7cff 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -8,8 +8,7 @@ Changes since 4.1.8:
 * Add the vtc feature ignore_unknown_macro.
 * Expose to VCL whether or not a fetch is a background fetch (bgfetch)
 * Ignore req.ttl when keeping track of expired objects (see 2422_)
-* Move the cli buffer to VSB (from stack). This deprecates the parameter
-  cli_buffer.
+* Move a cli buffer to VSB (from stack).
 * Use a separate stack for signals.
 
 .. _2422: https://github.com/varnishcache/varnish-cache/pull/2422
diff --git a/include/tbl/params.h b/include/tbl/params.h
index 3546b67..9a272a3 100644
--- a/include/tbl/params.h
+++ b/include/tbl/params.h
@@ -235,8 +235,10 @@ PARAM(
 	/* units */	"bytes",
 	/* flags */	0,
 	/* s-text */
-	"DEPRECATED: This parameter is ignored.\n"
-	"Memory for the CLI command buffer is now dynamically allocated.",
+	"Size of buffer for CLI command input.\n"
+	"You may need to increase this if you have big VCL files and use "
+	"the vcl.inline CLI command.\n"
+	"NB: Must be specified with -p to have effect.",
 	/* l-text */	"",
 	/* func */	NULL
 )


More information about the varnish-commit mailing list