Skip to content

Commit 1150ebb

Browse files
Bump github.com/caddyserver/caddy/v2 from 2.10.0 to 2.10.2 (#8)
Bumps [github.com/caddyserver/caddy/v2](https://github.com/caddyserver/caddy) from 2.10.0 to 2.10.2. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/caddyserver/caddy/releases">github.com/caddyserver/caddy/v2's releases</a>.</em></p> <blockquote> <h2>v2.10.2</h2> <p>This is a hotfix release to fix a couple critical issues from v2.10.1</p> <h2>What's Changed</h2> <ul> <li>http: Make logger first, before TLS provisioning by <a href="https://github.com/francislavoie"><code>@​francislavoie</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/7198">caddyserver/caddy#7198</a></li> <li>httpcaddyfile: Fix <code>acme_dns</code> regression by <a href="https://github.com/francislavoie"><code>@​francislavoie</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/7199">caddyserver/caddy#7199</a></li> <li>caddyfile: Fix importing nested tokens for <code>{block}</code> by <a href="https://github.com/BeeJay28"><code>@​BeeJay28</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/7189">caddyserver/caddy#7189</a></li> </ul> <h2>Changelog</h2> <ul> <li>551f793700fe1550845c824470b623fd1aa03d36 caddyfile: Fix importing nested tokens for <code>{block}</code> (<a href="https://redirect.github.com/caddyserver/caddy/issues/7189">#7189</a>)</li> <li>16fe83c7afe2152b0bb53ae35078a28f87e6dcf2 http: Make logger first, before TLS provisioning (<a href="https://redirect.github.com/caddyserver/caddy/issues/7198">#7198</a>)</li> <li>4564261d8350f8010b7e001e646e260e9bba5746 httpcaddyfile: Fix <code>acme_dns</code> regression (<a href="https://redirect.github.com/caddyserver/caddy/issues/7199">#7199</a>)</li> </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/BeeJay28"><code>@​BeeJay28</code></a> made their first contribution in <a href="https://redirect.github.com/caddyserver/caddy/pull/7189">caddyserver/caddy#7189</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/caddyserver/caddy/compare/v2.10.1...v2.10.2">https://github.com/caddyserver/caddy/compare/v2.10.1...v2.10.2</a></p> <h2>v2.10.1</h2> <p>This is probably our biggest patch release ever -- not that lots of things were broken, but there's lots of refinement happening thanks to broader adoption and contributions from many more people. Just look at the New Contributors below!</p> <p>Anyway, this release does contain some bug fixes and dependency upgrades which we hope will serve you well. Let us know if there's any issues! And thank you to all who contributed, especially our reliable maintainer team!</p> <p>This version of Caddy requires <a href="https://golang.org/dl/">Go v1.25.0 or newer</a>.</p> <h2>What's Changed</h2> <ul> <li>update quic-go to v0.51.0 by <a href="https://github.com/marten-seemann"><code>@​marten-seemann</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/6972">caddyserver/caddy#6972</a></li> <li>forwardproxy: reference correct field name in LoadModule by <a href="https://github.com/mohammed90"><code>@​mohammed90</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/6978">caddyserver/caddy#6978</a></li> <li>fix: Remove <code>nil</code> arg from <code>zapslog.NewHandler</code> call by <a href="https://github.com/IndraGunawan"><code>@​IndraGunawan</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/6984">caddyserver/caddy#6984</a></li> <li>fileserver: Add support for .avif image format by <a href="https://github.com/steffenbusch"><code>@​steffenbusch</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/6988">caddyserver/caddy#6988</a></li> <li>reverseproxy: use DialTLSContext for TLS if servername has placeholder by <a href="https://github.com/WeidiDeng"><code>@​WeidiDeng</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/6955">caddyserver/caddy#6955</a></li> <li>admin: Make sure that any admin routers are provisioned when local/re… by <a href="https://github.com/Compy"><code>@​Compy</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/6997">caddyserver/caddy#6997</a></li> <li>log: default logger should respect <code>{in,ex}clude</code> by <a href="https://github.com/mohammed90"><code>@​mohammed90</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/6995">caddyserver/caddy#6995</a></li> <li>Move local admin server replacement logic below data structure initia… by <a href="https://github.com/Compy"><code>@​Compy</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/7004">caddyserver/caddy#7004</a></li> <li>acme_server: fix policy parsing in caddyfile by <a href="https://github.com/mohammed90"><code>@​mohammed90</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/7006">caddyserver/caddy#7006</a></li> <li>implement Unwrap for interceptedResponseHandler by <a href="https://github.com/WeidiDeng"><code>@​WeidiDeng</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/7016">caddyserver/caddy#7016</a></li> <li>fileserver: map invalid path errors to fs.ErrInvalid, and return 400 … by <a href="https://github.com/Compy"><code>@​Compy</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/7017">caddyserver/caddy#7017</a></li> <li>caddyhttp: fix route sort by comparing paths without wildcard if they don't shar… by <a href="https://github.com/WeidiDeng"><code>@​WeidiDeng</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/7015">caddyserver/caddy#7015</a></li> <li>refactor: use maps.Copy for cleaner map handling by <a href="https://github.com/eveneast"><code>@​eveneast</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/7009">caddyserver/caddy#7009</a></li> <li>refactor: use slices.Contains to simplify code by <a href="https://github.com/tongjicoder"><code>@​tongjicoder</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/7039">caddyserver/caddy#7039</a></li> <li>chore: upgrade .golangci.yml and workflow to v2 by <a href="https://github.com/mohammed90"><code>@​mohammed90</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/6924">caddyserver/caddy#6924</a></li> <li>build(deps): bump golangci/golangci-lint-action from 6 to 8 by <a href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot] in <a href="https://redirect.github.com/caddyserver/caddy/pull/7044">caddyserver/caddy#7044</a></li> <li>fix: crash - null check on event origin by <a href="https://github.com/suxatcode"><code>@​suxatcode</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/7047">caddyserver/caddy#7047</a></li> <li>fix: prevent error handler from overriding sub handler matchers by <a href="https://github.com/Hellio404"><code>@​Hellio404</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/6999">caddyserver/caddy#6999</a></li> <li>client_auth: wire up leaf verifier Caddyfile by <a href="https://github.com/mohammed90"><code>@​mohammed90</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/6772">caddyserver/caddy#6772</a></li> <li>caddyfile: reject blocks in log_skip directive by <a href="https://github.com/IwatsukaYura"><code>@​IwatsukaYura</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/7056">caddyserver/caddy#7056</a></li> <li>build(deps): bump github.com/cloudflare/circl from 1.6.0 to 1.6.1 by <a href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot] in <a href="https://redirect.github.com/caddyserver/caddy/pull/7058">caddyserver/caddy#7058</a></li> <li>cmd: fix <code>Commands</code> function not returning all registered commands by <a href="https://github.com/hslatman"><code>@​hslatman</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/7059">caddyserver/caddy#7059</a></li> <li>ci: add dep review, OSSF scorecard actions by <a href="https://github.com/mohammed90"><code>@​mohammed90</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/7063">caddyserver/caddy#7063</a></li> <li>ci: add <code>{base,head}-ref</code> to dep review check by <a href="https://github.com/mohammed90"><code>@​mohammed90</code></a> in <a href="https://redirect.github.com/caddyserver/caddy/pull/7064">caddyserver/caddy#7064</a></li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/caddyserver/caddy/commit/551f793700fe1550845c824470b623fd1aa03d36"><code>551f793</code></a> caddyfile: Fix importing nested tokens for <code>{block}</code> (<a href="https://redirect.github.com/caddyserver/caddy/issues/7189">#7189</a>)</li> <li><a href="https://github.com/caddyserver/caddy/commit/4564261d8350f8010b7e001e646e260e9bba5746"><code>4564261</code></a> httpcaddyfile: Fix <code>acme_dns</code> regression (<a href="https://redirect.github.com/caddyserver/caddy/issues/7199">#7199</a>)</li> <li><a href="https://github.com/caddyserver/caddy/commit/16fe83c7afe2152b0bb53ae35078a28f87e6dcf2"><code>16fe83c</code></a> http: Make logger first, before TLS provisioning (<a href="https://redirect.github.com/caddyserver/caddy/issues/7198">#7198</a>)</li> <li><a href="https://github.com/caddyserver/caddy/commit/3723e895854a1f9e528ec278acb0ed8ef1c63f81"><code>3723e89</code></a> go.mod: Upgrade CertMagic to v0.24.0</li> <li><a href="https://github.com/caddyserver/caddy/commit/14a63a26b9a673857fc37cba37aedc35a10ce634"><code>14a63a2</code></a> caddyhttp: use the new http.Protocols to handle h1, h2 and h2c requests (<a href="https://redirect.github.com/caddyserver/caddy/issues/6961">#6961</a>)</li> <li><a href="https://github.com/caddyserver/caddy/commit/67debd0e11c3c880bb6fc7a92325989576b0a7fa"><code>67debd0</code></a> fileserver: set Range header for precompressed static files to force Content ...</li> <li><a href="https://github.com/caddyserver/caddy/commit/b9710c6af4f764b463a8e0c080783f2b7fb15ce0"><code>b9710c6</code></a> fileserver: Add a few doc lines about Etag file content (<a href="https://redirect.github.com/caddyserver/caddy/issues/7173">#7173</a>)</li> <li><a href="https://github.com/caddyserver/caddy/commit/493898d9bd05da8e4ced1941b87b174fbc6b7677"><code>493898d</code></a> ci: set proper build tags in golangci and minor cleanup (<a href="https://redirect.github.com/caddyserver/caddy/issues/7183">#7183</a>)</li> <li><a href="https://github.com/caddyserver/caddy/commit/1c596e3c5a1cd0b52febb1506ffe471918bd1128"><code>1c596e3</code></a> reverse_proxy: use the new KeepAliveConfig to set probe interval (<a href="https://redirect.github.com/caddyserver/caddy/issues/7157">#7157</a>)</li> <li><a href="https://github.com/caddyserver/caddy/commit/f11c780fdc2e4e5298a64ef88d110dd392060a36"><code>f11c780</code></a> http: clean up listeners if some of the listeners fail to bind (<a href="https://redirect.github.com/caddyserver/caddy/issues/7176">#7176</a>)</li> <li>Additional commits viewable in <a href="https://github.com/caddyserver/caddy/compare/v2.10.0...v2.10.2">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/caddyserver/caddy/v2&package-manager=go_modules&previous-version=2.10.0&new-version=2.10.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent a20e728 commit 1150ebb

File tree

2 files changed

+69
-81
lines changed

2 files changed

+69
-81
lines changed

go.mod

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module github.com/liujed/caddy-dns01proxy
22

3-
go 1.24.3
3+
go 1.25
44

55
require (
66
github.com/BurntSushi/toml v1.5.0
7-
github.com/caddyserver/caddy/v2 v2.10.0
7+
github.com/caddyserver/caddy/v2 v2.10.2
88
github.com/caddyserver/certmagic v0.24.0
99
github.com/libdns/libdns v1.1.0
1010
github.com/liujed/goutil v0.0.0
@@ -15,14 +15,14 @@ require (
1515
)
1616

1717
require (
18-
cel.dev/expr v0.23.0 // indirect
18+
cel.dev/expr v0.24.0 // indirect
1919
cloud.google.com/go/auth v0.16.2 // indirect
2020
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
2121
cloud.google.com/go/compute/metadata v0.7.0 // indirect
2222
dario.cat/mergo v1.0.1 // indirect
2323
filippo.io/edwards25519 v1.1.0 // indirect
2424
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
25-
github.com/KimMachineGun/automemlimit v0.7.1 // indirect
25+
github.com/KimMachineGun/automemlimit v0.7.4 // indirect
2626
github.com/Masterminds/goutils v1.1.1 // indirect
2727
github.com/Masterminds/semver/v3 v3.3.0 // indirect
2828
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
@@ -47,14 +47,12 @@ require (
4747
github.com/francoispqt/gojay v1.2.13 // indirect
4848
github.com/go-jose/go-jose/v3 v3.0.4 // indirect
4949
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
50-
github.com/go-logr/logr v1.4.2 // indirect
50+
github.com/go-logr/logr v1.4.3 // indirect
5151
github.com/go-logr/stdr v1.2.2 // indirect
5252
github.com/go-sql-driver/mysql v1.8.1 // indirect
53-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
5453
github.com/golang/protobuf v1.5.4 // indirect
5554
github.com/golang/snappy v0.0.4 // indirect
56-
github.com/google/cel-go v0.24.1 // indirect
57-
github.com/google/pprof v0.0.0-20231212022811-ec68065c825e // indirect
55+
github.com/google/cel-go v0.26.0 // indirect
5856
github.com/google/s2a-go v0.1.9 // indirect
5957
github.com/google/uuid v1.6.0 // indirect
6058
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
@@ -66,7 +64,7 @@ require (
6664
github.com/jackc/pgx/v5 v5.6.0 // indirect
6765
github.com/jackc/puddle/v2 v2.2.1 // indirect
6866
github.com/klauspost/compress v1.18.0 // indirect
69-
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
67+
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
7068
github.com/manifoldco/promptui v0.9.0 // indirect
7169
github.com/mattn/go-colorable v0.1.13 // indirect
7270
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -77,15 +75,14 @@ require (
7775
github.com/mitchellh/go-ps v1.0.0 // indirect
7876
github.com/mitchellh/reflectwalk v1.0.2 // indirect
7977
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
80-
github.com/onsi/ginkgo/v2 v2.13.2 // indirect
8178
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
8279
github.com/pkg/errors v0.9.1 // indirect
83-
github.com/prometheus/client_golang v1.22.0 // indirect
84-
github.com/prometheus/client_model v0.6.1 // indirect
85-
github.com/prometheus/common v0.62.0 // indirect
86-
github.com/prometheus/procfs v0.15.1 // indirect
80+
github.com/prometheus/client_golang v1.23.0 // indirect
81+
github.com/prometheus/client_model v0.6.2 // indirect
82+
github.com/prometheus/common v0.65.0 // indirect
83+
github.com/prometheus/procfs v0.16.1 // indirect
8784
github.com/quic-go/qpack v0.5.1 // indirect
88-
github.com/quic-go/quic-go v0.50.1 // indirect
85+
github.com/quic-go/quic-go v0.54.0 // indirect
8986
github.com/rs/xid v1.6.0 // indirect
9087
github.com/russross/blackfriday/v2 v2.1.0 // indirect
9188
github.com/shopspring/decimal v1.4.0 // indirect
@@ -105,28 +102,28 @@ require (
105102
go.etcd.io/bbolt v1.3.10 // indirect
106103
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
107104
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
108-
go.opentelemetry.io/otel v1.36.0 // indirect
109-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
110-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
105+
go.opentelemetry.io/otel v1.37.0 // indirect
106+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
107+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
111108
go.step.sm/crypto v0.67.0 // indirect
112109
go.uber.org/automaxprocs v1.6.0 // indirect
113110
go.uber.org/mock v0.5.2 // indirect
114111
go.uber.org/multierr v1.11.0 // indirect
115112
go.uber.org/zap/exp v0.3.0 // indirect
116-
golang.org/x/crypto v0.39.0 // indirect
113+
golang.org/x/crypto v0.40.0 // indirect
117114
golang.org/x/crypto/x509roots/fallback v0.0.0-20250305170421-49bf5b80c810 // indirect
118115
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
119116
golang.org/x/mod v0.25.0 // indirect
120-
golang.org/x/net v0.41.0 // indirect
117+
golang.org/x/net v0.42.0 // indirect
121118
golang.org/x/oauth2 v0.30.0 // indirect
122-
golang.org/x/sync v0.15.0 // indirect
123-
golang.org/x/sys v0.33.0 // indirect
124-
golang.org/x/term v0.32.0 // indirect
125-
golang.org/x/text v0.26.0 // indirect
119+
golang.org/x/sync v0.16.0 // indirect
120+
golang.org/x/sys v0.34.0 // indirect
121+
golang.org/x/term v0.33.0 // indirect
122+
golang.org/x/text v0.27.0 // indirect
126123
golang.org/x/time v0.12.0 // indirect
127-
golang.org/x/tools v0.33.0 // indirect
124+
golang.org/x/tools v0.34.0 // indirect
128125
google.golang.org/api v0.240.0 // indirect
129-
google.golang.org/genproto/googleapis/api v0.0.0-20250505200425-f936aa4a68b2 // indirect
126+
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
130127
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
131128
google.golang.org/grpc v1.73.0 // indirect
132129
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 // indirect

0 commit comments

Comments
 (0)