[master] 8a75838 Fix up some sess_workspace leftovers

Tollef Fog Heen tfheen at varnish-cache.org
Mon Feb 13 10:34:23 CET 2012


commit 8a758381848f885f9f39f963345697359bffc787
Author: Rogier 'DocWilco' Mulhuijzen <github at bsdchicks.com>
Date:   Wed Jan 18 10:51:14 2012 +0100

    Fix up some sess_workspace leftovers
    
    Found by: Joakim Berg <flashn at glck.net>

diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index cc918c1..6405cdd 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -406,7 +406,7 @@ main(int argc, char * const *argv)
 		 * Adjust default parameters for 32 bit systems to conserve
 		 * VM space.
 		 */
-		MCF_ParamSet(cli, "sess_workspace", "16384");
+		MCF_ParamSet(cli, "workspace_client", "16384");
 		cli_check(cli);
 
 		MCF_ParamSet(cli, "thread_pool_workspace", "16384");
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index 87b57ec..ff523b1 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -725,8 +725,8 @@ static const struct parspec input_parspec[] = {
 		"Maximum number of bytes of HTTP client request we will deal "
 		"with.  This is a limit on all bytes up to the double blank "
 		"line which ends the HTTP request.\n"
-		"The memory for the request is allocated from the session "
-		"workspace (param: sess_workspace) and this parameter limits "
+		"The memory for the request is allocated from the client "
+		"workspace (param: workspace_client) and this parameter limits "
 		"how much of that the request is allowed to take up.",
 		0,
 		"32k", "bytes" },
@@ -744,8 +744,8 @@ static const struct parspec input_parspec[] = {
 		"with.  This is a limit on all bytes up to the double blank "
 		"line which ends the HTTP request.\n"
 		"The memory for the request is allocated from the worker "
-		"workspace (param: sess_workspace) and this parameter limits "
-		"how much of that the request is allowed to take up.",
+		"workspace (param: thread_pool_workspace) and this parameter "
+		"limits how much of that the request is allowed to take up.",
 		0,
 		"32k", "bytes" },
 	{ "http_max_hdr", tweak_uint, &mgt_param.http_max_hdr, 32, 65535,



More information about the varnish-commit mailing list