Skip to content

[v14] Remove read/write timeouts to unbreak app access #34849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
r0mant merged 1 commit into from
Nov 21, 2023
Merged

[v14] Remove read/write timeouts to unbreak app access #34849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/service/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4064,9 +4064,9 @@ func (process *TeleportProcess) initProxyEndpoint(conn *Connector) error {
limiter.MakeMiddleware(proxyLimiter),
httplib.MakeTracingMiddleware(teleport.ComponentProxy),
),
ReadTimeout: apidefaults.DefaultIOTimeout,
// Note: read/write timeouts *should not* be set here because it
// will break some application access use-cases.
ReadHeaderTimeout: defaults.ReadHeadersTimeout,
WriteTimeout: apidefaults.DefaultIOTimeout,
IdleTimeout: apidefaults.DefaultIdleTimeout,
ErrorLog: utils.NewStdlogger(log.Error, teleport.ComponentProxy),
ConnState: ingress.HTTPConnStateReporter(ingress.Web, ingressReporter),
Expand Down
4 changes: 2 additions & 2 deletions lib/srv/app/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,10 +1051,10 @@ func (s *Server) newHTTPServer(clusterName string) *http.Server {
s.authMiddleware.Wrap(s)

return &http.Server{
// Note: read/write timeouts *should not* be set here because it will
// break application access.
Handler: httplib.MakeTracingHandler(s.authMiddleware, teleport.ComponentApp),
ReadTimeout: apidefaults.DefaultIOTimeout,
ReadHeaderTimeout: defaults.ReadHeadersTimeout,
WriteTimeout: apidefaults.DefaultIOTimeout,
IdleTimeout: apidefaults.DefaultIdleTimeout,
ErrorLog: utils.NewStdlogger(s.log.Error, teleport.ComponentApp),
ConnContext: func(ctx context.Context, c net.Conn) context.Context {
Expand Down