diff options
author | Vladimir Shushlin <vshushlin@gitlab.com> | 2022-04-25 14:03:48 +0300 |
---|---|---|
committer | Vladimir Shushlin <vshushlin@gitlab.com> | 2022-04-25 14:03:48 +0300 |
commit | 223c606e818f10b7b33d923deb5d35248b52fe43 (patch) | |
tree | 896643911e72c0c27bc3575963fabad22a7bb184 /internal | |
parent | b3318609c3a77c18fff50340b3bf6f38f4f80564 (diff) | |
parent | 790b92165f6e29cc7bada7862cdf3f1928170b23 (diff) |
Merge branch 'kassio/default-server-write-timeout-to-0' into 'master'
Tweaking default `serverWriteTimeout` to avoid problem with download of large files.
See merge request gitlab-org/gitlab-pages!741
Diffstat (limited to 'internal')
-rw-r--r-- | internal/config/flags.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/config/flags.go b/internal/config/flags.go index c2d315d1..75d01957 100644 --- a/internal/config/flags.go +++ b/internal/config/flags.go @@ -85,7 +85,7 @@ var ( // HTTP server timeouts serverReadTimeout = flag.Duration("server-read-timeout", 5*time.Second, "ReadTimeout is the maximum duration for reading the entire request, including the body. A zero or negative value means there will be no timeout.") serverReadHeaderTimeout = flag.Duration("server-read-header-timeout", time.Second, "ReadHeaderTimeout is the amount of time allowed to read request headers. A zero or negative value means there will be no timeout.") - serverWriteTimeout = flag.Duration("server-write-timeout", 5*time.Minute, "WriteTimeout is the maximum duration before timing out writes of the response. A zero or negative value means there will be no timeout.") + serverWriteTimeout = flag.Duration("server-write-timeout", 0, "WriteTimeout is the maximum duration before timing out writes of the response. A zero or negative value means there will be no timeout.") serverKeepAlive = flag.Duration("server-keep-alive", 15*time.Second, "KeepAlive specifies the keep-alive period for network connections accepted by this listener. If zero, keep-alives are enabled if supported by the protocol and operating system. If negative, keep-alives are disabled.") disableCrossOriginRequests = flag.Bool("disable-cross-origin-requests", false, "Disable cross-origin requests") |