[4.1] f4053ac Move first_byte_timeout param to new order

[Poul-Henning Kamp]

commit f4053ac00a0fd0b50b8095e586c23ebfd53b016c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Aug 17 05:34:09 2015 +0000

    Move first_byte_timeout param to new order

diff --git a/bin/varnishd/common/params.h b/bin/varnishd/common/params.h
index c8cd3a6..3dbfe6a 100644
--- a/bin/varnishd/common/params.h
+++ b/bin/varnishd/common/params.h
@@ -163,9 +163,6 @@ struct params {
 	/* Default connection_timeout */
 	double			connect_timeout;
 
-	/* Read timeouts for backend */
-	double			first_byte_timeout;
-
 	/* CLI buffer size */
 	unsigned		cli_buffer;
 
diff --git a/bin/varnishd/mgt/mgt_param_tbl.c b/bin/varnishd/mgt/mgt_param_tbl.c
index 565328e..e6318c1 100644
--- a/bin/varnishd/mgt/mgt_param_tbl.c
+++ b/bin/varnishd/mgt/mgt_param_tbl.c
@@ -308,17 +308,6 @@ struct parspec mgt_parspec[] = {
 		"backend request.",
 		0,
 		"3.5", "seconds" },
-	{ "first_byte_timeout", tweak_timeout,
-		&mgt_param.first_byte_timeout,
-		"0", NULL,
-		"Default timeout for receiving first byte from backend. "
-		"We only wait for this many seconds for the first "
-		"byte before giving up. A value of 0 means it will never time "
-		"out. "
-		"VCL can override this default value for each backend and "
-		"backend request. This parameter does not apply to pipe.",
-		0,
-		"60", "seconds" },
 	{ "clock_skew", tweak_uint, &mgt_param.clock_skew,
 		"0", NULL,
 		"How much clockskew we are willing to accept between the "
diff --git a/include/tbl/params.h b/include/tbl/params.h
index 36c1b0d..d3a2982 100644
--- a/include/tbl/params.h
+++ b/include/tbl/params.h
@@ -178,6 +178,24 @@ PARAM(
 )
 
 PARAM(
+	/* name */	first_byte_timeout,
+	/* tweak */	timeout,
+	/* min */	"0",
+	/* max */	NULL,
+	/* default */	"60",
+	/* units */	"seconds",
+	/* flags */	0,
+	/* s-text */
+	"Default timeout for receiving first byte from backend. We only "
+	"wait for this many seconds for the first byte before giving up. A "
+	"value of 0 means it will never time out. VCL can override this "
+	"default value for each backend and backend request. This "
+	"parameter does not apply to pipe.",
+	/* l-text */	"",
+	/* func */	NULL
+)
+
+PARAM(
 	/* name */	between_bytes_timeout,
 	/* tweak */	timeout,
 	/* min */	"0",
@@ -444,24 +462,6 @@ PARAM(
 	/* func */	NULL
 )
 PARAM(
-	/* name */	first_byte_timeout,
-	/* tweak */	tweak_timeout,
-	/* var */	first_byte_timeout,
-	/* min */	0.000,
-	/* max */	none,
-	/* default */	60.000,
-	/* units */	seconds,
-	/* flags */	00,
-	/* s-text */
-	"Default timeout for receiving first byte from backend. We only "
-	"wait for this many seconds for the first byte before giving up. A "
-	"value of 0 means it will never time out. VCL can override this "
-	"default value for each backend and backend request. This "
-	"parameter does not apply to pipe.\n",
-	/* l-text */	"",
-	/* func */	NULL
-)
-PARAM(
 	/* name */	gzip_buffer,
 	/* tweak */	tweak_bytes_u,
 	/* var */	gzip_buffer,