[master] 5aaf7cb pick up loose ends of cli_buffer removal

Nils Goroll nils.goroll at uplex.de
Wed Nov 8 07:31:06 UTC 2017


commit 5aaf7cb3507806e5bb0bc0fceb2fc1f676d7489f
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Nov 8 08:25:10 2017 +0100

    pick up loose ends of cli_buffer removal
    
    Ref: 6cb21b47a16be6b97b8197dd3cb79cef42999273
         #2382

diff --git a/bin/varnishtest/tests/r02382.vtc b/bin/varnishtest/tests/r02382.vtc
deleted file mode 100644
index 7a398b3..0000000
--- a/bin/varnishtest/tests/r02382.vtc
+++ /dev/null
@@ -1,21 +0,0 @@
-varnishtest "Very very big cli_buffer"
-
-# If the cli_buffer is on the stack, setting it very big can crash varnish
-
-server s1 {
-       rxreq
-       expect req.url == "/1"
-       txresp
-} -start
-
-varnish v1 -arg "-p cli_buffer=32M" -vcl+backend {
-} -start
-
-varnish v1 -cliok "ping"
-
-delay .5
-
-client c1 {
-       txreq -url /1
-       rxresp
-} -run
diff --git a/doc/changes.rst b/doc/changes.rst
index d900b93..f25fd7c 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -14,11 +14,13 @@ Varnish Cache Trunk (ongoing)
   ``req.hash_always_miss`` are now accessible from all of the client
   side subs, not just ``vcl_recv{}``
 
+* The ``cli_buffer`` parameter has been removed
+
 ================================
 Varnish Cache 5.2.0 (2017-09-15)
 ================================
 
-* The cli_buffer parameter has been deprecated (2382_)
+* The ``cli_buffer`` parameter has been deprecated (2382_)
 
 .. _2382: https://github.com/varnishcache/varnish-cache/pull/2382
 
diff --git a/include/tbl/params.h b/include/tbl/params.h
index 6560666..7bf45e9 100644
--- a/include/tbl/params.h
+++ b/include/tbl/params.h
@@ -286,21 +286,6 @@ PARAM(
 )
 
 PARAM(
-	/* name */	cli_buffer,
-	/* typ */	bytes_u,
-	/* min */	"4k",
-	/* max */	NULL,
-	/* default */	"8k",
-	/* units */	"bytes",
-	/* flags */	0,
-	/* s-text */
-	"DEPRECATED: This parameter is ignored.\n"
-	"Memory for the CLI command buffer is now dynamically allocated.",
-	/* l-text */	"",
-	/* func */	NULL
-)
-
-PARAM(
 	/* name */	cli_limit,
 	/* typ */	bytes_u,
 	/* min */	"128b",


More information about the varnish-commit mailing list