AdguardTeam/AdGuardHome
1
1
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2024-12-15 19:31:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Pull request: home: inc http timeouts

Browse Source 
Merge in DNS/adguard-home from 2671-timeout to master

Updates #2671.
Updates #2682.

Squashed commit of the following:

commit 79b1a36a79e3c7c26fc1a4b171feb050690f8c83
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Feb 15 15:25:26 2021 +0300

    all: doc changes

commit 84229b782bde433faa4ed8b71dd092965787d30e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Feb 15 15:12:33 2021 +0300

    home: imp names

commit b18d7b08473c99ddd37ecfa14be8d48838c2afab
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Feb 15 15:04:27 2021 +0300

    home: inc http timeouts
This commit is contained in:
Ainar Garipov 2021-02-15 15:36:38 +03:00
parent aebcd74efe
commit d295621352
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -19,6 +19,7 @@ and this project adheres to
### Changed ### Changed
- Increased HTTP API timeouts ([#2671], [#2682]).
- "Permission denied" errors when checking if the machine has a static IP no - "Permission denied" errors when checking if the machine has a static IP no
longer prevent the DHCP server from starting ([#2667]). longer prevent the DHCP server from starting ([#2667]).
- The server name sent by clients of TLS APIs is not only checked when - The server name sent by clients of TLS APIs is not only checked when
@ -46,8 +47,10 @@ and this project adheres to
[#2664]: https://github.com/AdguardTeam/AdGuardHome/issues/2664 [#2664]: https://github.com/AdguardTeam/AdGuardHome/issues/2664
[#2666]: https://github.com/AdguardTeam/AdGuardHome/issues/2666 [#2666]: https://github.com/AdguardTeam/AdGuardHome/issues/2666
[#2667]: https://github.com/AdguardTeam/AdGuardHome/issues/2667 [#2667]: https://github.com/AdguardTeam/AdGuardHome/issues/2667
[#2671]: https://github.com/AdguardTeam/AdGuardHome/issues/2671
[#2675]: https://github.com/AdguardTeam/AdGuardHome/issues/2675 [#2675]: https://github.com/AdguardTeam/AdGuardHome/issues/2675
[#2678]: https://github.com/AdguardTeam/AdGuardHome/issues/2678 [#2678]: https://github.com/AdguardTeam/AdGuardHome/issues/2678
[#2682]: https://github.com/AdguardTeam/AdGuardHome/issues/2682

6
internal/home/home.go
View File

@ -295,9 +295,9 @@ func run(args options) {
BindPort: config.BindPort, BindPort: config.BindPort,
BetaBindPort: config.BetaBindPort, BetaBindPort: config.BetaBindPort,
ReadTimeout: ReadTimeout, ReadTimeout: readTimeout,
ReadHeaderTimeout: ReadHeaderTimeout, ReadHeaderTimeout: readHdrTimeout,
WriteTimeout: WriteTimeout, WriteTimeout: writeTimeout,
} }
Context.web = CreateWeb(&webConf) Context.web = CreateWeb(&webConf)
if Context.web == nil { if Context.web == nil {

15
internal/home/web.go
View File

@ -16,17 +16,14 @@ import (
) )
const ( const (
// ReadTimeout is the maximum duration for reading the entire request, // readTimeout is the maximum duration for reading the entire request,
// including the body. // including the body.
ReadTimeout = 10 * time.Second readTimeout = 30 * time.Second
// readHdrTimeout is the amount of time allowed to read request headers.
// ReadHeaderTimeout is the amount of time allowed to read request readHdrTimeout = 30 * time.Second
// headers. // writeTimeout is the maximum duration before timing out writes of the
ReadHeaderTimeout = 10 * time.Second
// WriteTimeout is the maximum duration before timing out writes of the
// response. // response.
WriteTimeout = 10 * time.Second writeTimeout = 30 * time.Second
) )
type webConfig struct { type webConfig struct {