Added idleTimout to config and to serve.go HTTP server (#635)

* Added idleTimout to config and to serve.go HTTP server
* updated fabio.properties to include idle timeout doco
* added in testing for idle timeout

config/config.go

@@ -38,6 +38,7 @@ type Listen struct {
 	Proto              string
 	ReadTimeout        time.Duration
 	WriteTimeout       time.Duration
+	IdleTimeout        time.Duration
 	CertSource         CertSource
 	StrictMatch        bool
 	TLSMinVersion      uint16

config/default.go

@@ -12,6 +12,7 @@ var defaultValues = struct {
 	AuthSchemesValue      string
 	ReadTimeout           time.Duration
 	WriteTimeout          time.Duration
+	IdleTimeout           time.Duration
 	UIListenerValue       string
 	GZIPContentTypesValue string
 }{

config/load.go

@@ -399,6 +399,12 @@ func parseListen(cfg map[string]string, cs map[string]CertSource, readTimeout, w
 				return Listen{}, err
 			}
 			l.WriteTimeout = d
+		case "it": // idle timeout
+			d, err := time.ParseDuration(v)
+			if err != nil {
+				return Listen{}, err
+			}
+			l.IdleTimeout = d
 		case "cs": // cert source
 			csName = v
 			c, ok := cs[v]

config/load_test.go

@@ -114,14 +114,15 @@ func TestLoad(t *testing.T) {
 		},
 		{
 			desc: "-proxy.addr with tls configs",
-			args: []string{"-proxy.addr", `:5555;rt=1s;wt=2s;tlsmin=0x0300;tlsmax=0x305;tlsciphers="0x123,0x456"`},
+			args: []string{"-proxy.addr", `:5555;rt=1s;wt=2s;it=3s;tlsmin=0x0300;tlsmax=0x305;tlsciphers="0x123,0x456"`},
 			cfg: func(cfg *Config) *Config {
 				cfg.Listen = []Listen{
 					{
 						Addr:          ":5555",
 						Proto:         "http",
 						ReadTimeout:   1 * time.Second,
 						WriteTimeout:  2 * time.Second,
+						IdleTimeout:   3 * time.Second,
 						TLSMinVersion: 0x300,
 						TLSMaxVersion: 0x305,
 						TLSCiphers:    []uint16{0x123, 0x456},
@@ -132,14 +133,15 @@ func TestLoad(t *testing.T) {
 		},
 		{
 			desc: "-proxy.addr with named tls configs",
-			args: []string{"-proxy.addr", `:5555;rt=1s;wt=2s;tlsmin=tls10;tlsmax=TLS11;tlsciphers="TLS_RSA_WITH_RC4_128_SHA,tls_ecdhe_ecdsa_with_aes_256_gcm_sha384"`},
+			args: []string{"-proxy.addr", `:5555;rt=1s;wt=2s;it=3s;tlsmin=tls10;tlsmax=TLS11;tlsciphers="TLS_RSA_WITH_RC4_128_SHA,tls_ecdhe_ecdsa_with_aes_256_gcm_sha384"`},
 			cfg: func(cfg *Config) *Config {
 				cfg.Listen = []Listen{
 					{
 						Addr:          ":5555",
 						Proto:         "http",
 						ReadTimeout:   1 * time.Second,
 						WriteTimeout:  2 * time.Second,
+						IdleTimeout:   3 * time.Second,
 						TLSMinVersion: tls.VersionTLS10,
 						TLSMaxVersion: tls.VersionTLS11,
 						TLSCiphers:    []uint16{tls.TLS_RSA_WITH_RC4_128_SHA, tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384},

docs/content/ref/proxy.addr.md

@@ -39,6 +39,8 @@ to the destination without decrypting the traffic.
 
 * `wt`: Sets the write timeout as a duration value (e.g. `3s`)
 
+* `it`: Sets the idle timeout as a duration value (e.g. `3s`)
+
 * `strictmatch`: When set to `true` the certificate source must provide
   a certificate that matches the hostname for the connection
   to be established. Otherwise, the first certificate is used

fabio.properties

@@ -224,6 +224,8 @@
 #
 #   wt:          Sets the write timeout as a duration value (e.g. '3s')
 #
+#   it:          Sets the idle timeout as a duration value (e.g. '3s')
+#
 #   strictmatch: When set to 'true' the certificate source must provide
 #                a certificate that matches the hostname for the connection
 #                to be established. Otherwise, the first certificate is used

proxy/serve.go

@@ -67,6 +67,7 @@ func ListenAndServeHTTP(l config.Listen, h http.Handler, cfg *tls.Config) error
 		Handler:      h,
 		ReadTimeout:  l.ReadTimeout,
 		WriteTimeout: l.WriteTimeout,
+		IdleTimeout:  l.IdleTimeout,
 		TLSConfig:    cfg,
 	}
 	return serve(ln, srv)