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: all: prep release

Browse Source 
Merge in DNS/adguard-home from prep-release to master

Squashed commit of the following:

commit 32d83fe663dfd7a585ed9d89d09d47fd7b4cb653
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Feb 15 16:02:56 2021 +0300

    all: prep release
This commit is contained in:
Ainar Garipov 2021-02-15 16:25:44 +03:00
parent ab81ff03f6
commit a1c9e9d36b
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@ -14,9 +14,11 @@ and this project adheres to
--> -->
<!-- <!--
## [v0.105.1] - 2021-02-24 ## [v0.105.2] - 2021-02-24
--> -->
## [v0.105.1] - 2021-02-15
### Changed ### Changed
- Increased HTTP API timeouts ([#2671], [#2682]). - Increased HTTP API timeouts ([#2671], [#2682]).
@ -192,10 +194,12 @@ and this project adheres to
<!-- <!--
[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.105.2...HEAD
[v0.105.2]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.105.1...v0.105.2
-->
[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.105.1...HEAD [Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.105.1...HEAD
[v0.105.1]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.105.0...v0.105.1 [v0.105.1]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.105.0...v0.105.1
-->
[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.105.0...HEAD
[v0.105.0]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.104.3...v0.105.0 [v0.105.0]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.104.3...v0.105.0
[v0.104.3]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.104.2...v0.104.3 [v0.104.3]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.104.2...v0.104.3
[v0.104.2]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.104.1...v0.104.2 [v0.104.2]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.104.1...v0.104.2

6
internal/home/web.go
View File

@ -18,12 +18,12 @@ 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 = 30 * time.Second readTimeout = 60 * time.Second
// readHdrTimeout is the amount of time allowed to read request headers. // readHdrTimeout is the amount of time allowed to read request headers.
readHdrTimeout = 30 * time.Second readHdrTimeout = 60 * time.Second
// writeTimeout is the maximum duration before timing out writes of the // writeTimeout is the maximum duration before timing out writes of the
// response. // response.
writeTimeout = 30 * time.Second writeTimeout = 60 * time.Second
) )
type webConfig struct { type webConfig struct {