[master] 071a8d8 Limit vsl_space and vsm_space in a 32bit compatible fashion

[Poul-Henning Kamp]

commit 071a8d840a2d9f13f73af8f9eba5f168519a96fb
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Jan 2 13:17:02 2017 +0000

    Limit vsl_space and vsm_space in a 32bit compatible fashion

diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 9be977b..c0bdd6e 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -436,6 +436,9 @@ init_params(struct cli *cli)
 		MCF_ParamConf(MCF_DEFAULT, "http_resp_size", "8k");
 		MCF_ParamConf(MCF_DEFAULT, "http_req_size", "12k");
 		MCF_ParamConf(MCF_DEFAULT, "gzip_buffer", "4k");
+	} else {
+		MCF_ParamConf(MCF_MAXIMUM, "vsl_space", "4G");
+		MCF_ParamConf(MCF_MAXIMUM, "vsm_space", "4G");
 	}
 
 #if !defined(HAVE_ACCEPT_FILTERS) || defined(__linux)
diff --git a/include/tbl/params.h b/include/tbl/params.h
index 36aa4b0..d54114d 100644
--- a/include/tbl/params.h
+++ b/include/tbl/params.h
@@ -1513,7 +1513,7 @@ PARAM(
 	/* name */	vsl_space,
 	/* typ */	bytes,
 	/* min */	"1M",
-	/* max */	"4G",
+	/* max */	"2G",
 	/* default */	"80M",
 	/* units */	"bytes",
 	/* flags */	MUST_RESTART,
@@ -1530,7 +1530,7 @@ PARAM(
 	/* name */	vsm_space,
 	/* typ */	bytes,
 	/* min */	"1M",
-	/* max */	"4G",
+	/* max */	"2G",
 	/* default */	"1M",
 	/* units */	"bytes",
 	/* flags */	MUST_RESTART,