From b64d60f3076d58403b8cb0944face5b9cdeb7368 Mon Sep 17 00:00:00 2001 From: Jaime Martinez Date: Mon, 26 Oct 2020 16:29:55 +1100 Subject: Add more client timeouts --- internal/httptransport/transport.go | 4 ++++ internal/httptransport/transport_test.go | 3 +++ 2 files changed, 7 insertions(+) diff --git a/internal/httptransport/transport.go b/internal/httptransport/transport.go index bc871ea7..7d388d81 100644 --- a/internal/httptransport/transport.go +++ b/internal/httptransport/transport.go @@ -43,6 +43,10 @@ func newInternalTransport() *http.Transport { MaxIdleConns: 100, MaxIdleConnsPerHost: 100, IdleConnTimeout: 90 * time.Second, + // Set more timeouts https://gitlab.com/gitlab-org/gitlab-pages/-/issues/495 + TLSHandshakeTimeout: 10 * time.Second, + ResponseHeaderTimeout: 15 * time.Second, + ExpectContinueTimeout: 1 * time.Second, } } diff --git a/internal/httptransport/transport_test.go b/internal/httptransport/transport_test.go index a4105bef..5df0175a 100644 --- a/internal/httptransport/transport_test.go +++ b/internal/httptransport/transport_test.go @@ -92,4 +92,7 @@ func TestInternalTransportShouldHaveCustomConnectionPoolSettings(t *testing.T) { require.EqualValues(t, 100, InternalTransport.MaxIdleConnsPerHost) require.EqualValues(t, 0, InternalTransport.MaxConnsPerHost) require.EqualValues(t, 90*time.Second, InternalTransport.IdleConnTimeout) + require.EqualValues(t, 10*time.Second, InternalTransport.TLSHandshakeTimeout) + require.EqualValues(t, 15*time.Second, InternalTransport.ResponseHeaderTimeout) + require.EqualValues(t, 1*time.Second, InternalTransport.ExpectContinueTimeout) } -- cgit v1.2.3