Merge pull request #14220 from knobunc/feature/add-fin-timeouts

Merged by openshift-bot
openshift · May 24, 2017 · 61b1f2a · 61b1f2a
2 parents 67275e1 + 3939a73
commit 61b1f2a
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/images/router/haproxy/conf/haproxy-config.template b/images/router/haproxy/conf/haproxy-config.template
@@ -65,11 +65,21 @@ defaults
 {{- else }}
   timeout client 30s
 {{- end }}
+{{- if (matchPattern "[1-9][0-9]*(us|ms|s|m|h|d)?" (env "ROUTER_CLIENT_FIN_TIMEOUT" "")) }}
+  timeout client-fin {{env "ROUTER_CLIENT_FIN_TIMEOUT" "1s"}}
+{{- else }}
+  timeout client-fin 1s
+{{- end }}
 {{- if (matchPattern "[1-9][0-9]*(us|ms|s|m|h|d)?" (env "ROUTER_DEFAULT_SERVER_TIMEOUT" "")) }}
   timeout server {{env "ROUTER_DEFAULT_SERVER_TIMEOUT" "30s"}}
 {{- else }}
   timeout server 30s
 {{- end }}
+{{- if (matchPattern "[1-9][0-9]*(us|ms|s|m|h|d)?" (env "ROUTER_DEFAULT_SERVER_FIN_TIMEOUT" "")) }}
+  timeout server-fin {{env "ROUTER_DEFAULT_SERVER_FIN_TIMEOUT" "1s"}}
+{{- else }}
+  timeout server-fin 1s
+{{- end }}
 {{- if (matchPattern "[1-9][0-9]*(us|ms|s|m|h|d)?" (env "ROUTER_SLOWLORIS_TIMEOUT" "")) }}
   timeout http-request {{env "ROUTER_SLOWLORIS_TIMEOUT" "10s" }}
 {{- else }}