Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
caddy
Commits
74940af6
Commit
74940af6
authored
Jul 27, 2017
by
Matthew Holt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
httpserver: Set default idle timeout of 5 minutes (closes #1733)
Also clarified a comment in SiteConfig
parent
32ec39cd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
caddyhttp/httpserver/server.go
caddyhttp/httpserver/server.go
+3
-3
caddyhttp/httpserver/siteconfig.go
caddyhttp/httpserver/siteconfig.go
+2
-1
No files found.
caddyhttp/httpserver/server.go
View file @
74940af6
...
@@ -461,9 +461,9 @@ func (s *Server) OnStartupComplete() {
...
@@ -461,9 +461,9 @@ func (s *Server) OnStartupComplete() {
}
}
// defaultTimeouts stores the default timeout values to use
// defaultTimeouts stores the default timeout values to use
// if left unset by user configuration. NOTE:
Default timeouts
// if left unset by user configuration. NOTE:
Most default
//
are disabled (see issue #1464
).
//
timeouts are disabled (see issues #1464 and #1733
).
var
defaultTimeouts
Timeouts
var
defaultTimeouts
=
Timeouts
{
IdleTimeout
:
5
*
time
.
Minute
}
// tcpKeepAliveListener sets TCP keep-alive timeouts on accepted
// tcpKeepAliveListener sets TCP keep-alive timeouts on accepted
// connections. It's used by ListenAndServe and ListenAndServeTLS so
// connections. It's used by ListenAndServe and ListenAndServeTLS so
...
...
caddyhttp/httpserver/siteconfig.go
View file @
74940af6
...
@@ -53,7 +53,8 @@ type SiteConfig struct {
...
@@ -53,7 +53,8 @@ type SiteConfig struct {
// websockets, etc.
// websockets, etc.
Timeouts
Timeouts
Timeouts
Timeouts
// If true all unmatched requests will be served by this site
// If true, any requests not matching other site definitions
// may be served by this site.
FallbackSite
bool
FallbackSite
bool
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment