Skip to content

Commit

Permalink
set new default to the same as previous default
Browse files Browse the repository at this point in the history
hopefully avoids unexpected behavior change for existing users, while
providing the ability to perform environment specific tuning as needed
  • Loading branch information
dropwhile committed Aug 18, 2024
1 parent 8500ee6 commit 27caafc
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
13 changes: 8 additions & 5 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,14 @@ toc::[]
Default is 30s (same as previosly).
* Add CLI flag for configuring IdleTimeout, the maximum amount of time to wait
for the next request when keep-alive is enabled (frontend). +
Default is 60 seconds.

Previously this value was not set, so it defaulted to the zero value, in
which case the ReadTimeout value (default 30s) was used internally by the go
http server.
Default is 30 seconds.
+
[NOTE]
--
Previously this value was not set, so it defaulted to the zero value, in
which case the ReadTimeout value (default 30s) was used internally by the go
http server. The new default mirrors the old default.
--

== v2.5.1 2024-07-02
* Rebuild release with Go-1.22.5
Expand Down
2 changes: 1 addition & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ Building requires:
* make
* posix compatible shell (sh)
* git
* go (latest version recommended. At least version >= 1.22)
* go (most recent version recommended)
* {link-asciidoctor} (for building man pages only)

Building:
Expand Down
2 changes: 1 addition & 1 deletion cmd/go-camo/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ type CLI struct { // betteralign:ignore
SSLCert string `name:"ssl-cert" placeholder:"PATH" help:"ssl cert (cert.pem) path"`
MaxSize int64 `name:"max-size" placeholder:"INT" help:"Max allowed response size, in KB"`
ReqTimeout time.Duration `name:"timeout" default:"4s" help:"Upstream request timeout (backend)"`
IdleTimeout time.Duration `name:"idletimeout" default:"60s" help:"Maximum amount of time to wait for the next request when keep-alive is enabled (frontend)"`
IdleTimeout time.Duration `name:"idletimeout" default:"30s" help:"Maximum amount of time to wait for the next request when keep-alive is enabled (frontend)"`
ReadTimeout time.Duration `name:"readtimeout" default:"30s" help:"Maximum duration for reading the entire request, including the body (frontend)"`
MaxRedirects int `name:"max-redirects" default:"3" help:"Maximum number of redirects to follow"`
MaxSizeRedirect string `name:"max-size-redirect" placeholder:"URL" help:"redirect to URL when max-size is exceeded"`
Expand Down

0 comments on commit 27caafc

Please sign in to comment.