merge #1
Merged
merge #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge in DNS/dnsproxy from 3551-dont-panic to master Updates AdguardTeam/AdGuardHome#3551. Squashed commit of the following: commit 570d149 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Sep 8 17:20:46 2021 +0300 proxy: fix index panic
Merge in DNS/dnsproxy from optimistic-cache-flag to master Closes AdguardTeam#160. Squashed commit of the following: commit b5df791 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Sep 20 13:25:26 2021 +0300 all: fix readme
Merge in DNS/dnsproxy from 161-fallback-bootstrap to master Updates AdguardTeam#161. Squashed commit of the following: commit 5ce87d4 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Sep 20 14:08:02 2021 +0300 all: share settings between upstream and fallback
Merge in DNS/dnsproxy from 162-idles to master Closes AdguardTeam#162. Squashed commit of the following: commit b5a4f75 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Sep 21 13:24:47 2021 +0300 all: imp docs commit d7ca024 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Sep 20 18:49:58 2021 +0300 upstream: imp idle connections handling
Merge in DNS/dnsproxy from fix-168 to master Squashed commit of the following: commit 5093bcf Author: Andrey Meshkov <am@adguard.com> Date: Tue Sep 28 19:12:01 2021 +0300 ForceAttemptHTTP2 to true, fix AdguardTeam#168
Merge in DNS/dnsproxy from 168-fix-server-alpn to master Squashed commit of the following: commit b1ccb1b Author: Andrey Meshkov <am@adguard.com> Date: Wed Sep 29 13:56:42 2021 +0300 fix review comments commit 9a705e6 Author: Andrey Meshkov <am@adguard.com> Date: Wed Sep 29 11:57:27 2021 +0300 Fix AdguardTeam#168, changed server ALPN extensions There're several changes in this commit. First, HTTP2 is now preferred over HTTP1 by both the client and the server. Second, I've added the "dot" ALPN value for both TLS client and servers. The servers I know do not require it, but since this is a registered value IANA, it'd be better to have it just in case. And last, every server now clones the tls.Config for the sake of having different NextProtos lists. Clone copies everything including callback methods (GetCertificate, VerifyCertificate, etc) so I don't expect any issues with the library users.
Co-authored-by: Andrey Meshkov <ay.meshkov@gmail.com>
Co-authored-by: Andrey Meshkov <ay.meshkov@gmail.com>
Merge in DNS/dnsproxy from 170-yaml-config to master * commit '83975b53dee1c9c679195a82f31232411c08a09f': all: imp docs all: imp fmt Update main.go Handling ListenAddrs and ListenPorts default values Update main.go Update main.go Update README.md Update parallel.go Update parallel.go Update parallel.go Update bootstrap_resolver.go Delete config.yaml Update README.md Update README.md merging Solving @ameshkov requests to add yaml config file Update README.md updating config.yaml yaml file adding yamlconfig file support
Merge in DNS/dnsproxy from 3707-cache-negative to master Updates AdguardTeam/AdGuardHome#3707. Squashed commit of the following: commit f5e8a32 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 25 20:50:46 2021 +0300 proxy: imp docs commit f3fc155 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 25 20:12:32 2021 +0300 proxy: imp caching of negative answers
Merge in DNS/dnsproxy from 185-fix-tls to master Updates AdguardTeam#185. Squashed commit of the following: commit 42572b3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Nov 8 16:19:57 2021 +0500 upstream: imp docs commit 58928c7 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Nov 8 16:10:00 2021 +0500 upstream: rm alpn from tls config
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.