[master] 60366f3 Simplify

[Federico G. Schwindt]

commit 60366f388345c832416364c094fa6f83455e05fc
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Tue Jan 3 03:54:54 2017 +0000

    Simplify

diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 11d1625..889bbdb 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -435,9 +435,8 @@ 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");
+		MCF_ParamConf(MCF_MAXIMUM, "vsl_space", "1G");
+		MCF_ParamConf(MCF_MAXIMUM, "vsm_space", "1G");
 	}
 
 #if !defined(HAVE_ACCEPT_FILTERS) || defined(__linux)
diff --git a/include/tbl/params.h b/include/tbl/params.h
index 5b79f8c..a1d52db 100644
--- a/include/tbl/params.h
+++ b/include/tbl/params.h
@@ -1514,7 +1514,7 @@ PARAM(
 	/* name */	vsl_space,
 	/* typ */	bytes,
 	/* min */	"1M",
-	/* max */	"1G",
+	/* max */	"4G",
 	/* default */	"80M",
 	/* units */	"bytes",
 	/* flags */	MUST_RESTART,
@@ -1531,7 +1531,7 @@ PARAM(
 	/* name */	vsm_space,
 	/* typ */	bytes,
 	/* min */	"1M",
-	/* max */	"1G",
+	/* max */	"4G",
 	/* default */	"1M",
 	/* units */	"bytes",
 	/* flags */	MUST_RESTART,