Commit 1150ebb
authored
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 />
[](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
2 files changed
+69
-81
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
| 25 | + | |
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
| |||
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | | - | |
| 50 | + | |
51 | 51 | | |
52 | 52 | | |
53 | | - | |
54 | 53 | | |
55 | 54 | | |
56 | | - | |
57 | | - | |
| 55 | + | |
58 | 56 | | |
59 | 57 | | |
60 | 58 | | |
| |||
66 | 64 | | |
67 | 65 | | |
68 | 66 | | |
69 | | - | |
| 67 | + | |
70 | 68 | | |
71 | 69 | | |
72 | 70 | | |
| |||
77 | 75 | | |
78 | 76 | | |
79 | 77 | | |
80 | | - | |
81 | 78 | | |
82 | 79 | | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
87 | 84 | | |
88 | | - | |
| 85 | + | |
89 | 86 | | |
90 | 87 | | |
91 | 88 | | |
| |||
105 | 102 | | |
106 | 103 | | |
107 | 104 | | |
108 | | - | |
109 | | - | |
110 | | - | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
111 | 108 | | |
112 | 109 | | |
113 | 110 | | |
114 | 111 | | |
115 | 112 | | |
116 | | - | |
| 113 | + | |
117 | 114 | | |
118 | 115 | | |
119 | 116 | | |
120 | | - | |
| 117 | + | |
121 | 118 | | |
122 | | - | |
123 | | - | |
124 | | - | |
125 | | - | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
126 | 123 | | |
127 | | - | |
| 124 | + | |
128 | 125 | | |
129 | | - | |
| 126 | + | |
130 | 127 | | |
131 | 128 | | |
132 | 129 | | |
| |||
0 commit comments