Skip to content

Commit 4550027

Browse files
committed
feat: upgrade to Caddy 2.10
1 parent 7f8e43f commit 4550027

2 files changed

Lines changed: 279 additions & 278 deletions

File tree

caddy/go.mod

Lines changed: 77 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
module github.com/dunglas/frankenphp/caddy
22

3-
go 1.23.0
3+
go 1.24
44

5-
toolchain go1.24.0
5+
toolchain go1.24.2
66

77
replace github.com/dunglas/frankenphp => ../
88

99
retract v1.0.0-rc.1 // Human error
1010

1111
require (
12-
github.com/caddyserver/caddy/v2 v2.9.1
13-
github.com/caddyserver/certmagic v0.22.0
12+
github.com/caddyserver/caddy/v2 v2.10.0
13+
github.com/caddyserver/certmagic v0.23.0
1414
github.com/dunglas/caddy-cbrotli v1.0.0
1515
github.com/dunglas/frankenphp v1.5.0
1616
github.com/dunglas/mercure/caddy v0.18.4
17-
github.com/dunglas/vulcain/caddy v1.1.1
17+
github.com/dunglas/vulcain/caddy v1.2.0
1818
github.com/prometheus/client_golang v1.22.0
1919
github.com/spf13/cobra v1.9.1
2020
github.com/stretchr/testify v1.10.0
@@ -24,30 +24,33 @@ require (
2424
require github.com/smallstep/go-attestation v0.4.4-0.20240109183208-413678f90935 // indirect
2525

2626
require (
27-
cel.dev/expr v0.20.0 // indirect
27+
cel.dev/expr v0.23.1 // indirect
2828
dario.cat/mergo v1.0.1 // indirect
2929
filippo.io/edwards25519 v1.1.0 // indirect
3030
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
31-
github.com/BurntSushi/toml v1.4.0 // indirect
31+
github.com/BurntSushi/toml v1.5.0 // indirect
32+
github.com/KimMachineGun/automemlimit v0.7.1 // indirect
3233
github.com/Masterminds/goutils v1.1.1 // indirect
3334
github.com/Masterminds/semver/v3 v3.3.1 // indirect
3435
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
3536
github.com/MauriceGit/skiplist v0.0.0-20211105230623-77f5c8d3e145 // indirect
36-
github.com/MicahParks/jwkset v0.8.0 // indirect
37-
github.com/MicahParks/keyfunc/v3 v3.3.10 // indirect
37+
github.com/MicahParks/jwkset v0.9.5 // indirect
38+
github.com/MicahParks/keyfunc/v3 v3.3.11 // indirect
3839
github.com/Microsoft/go-winio v0.6.2 // indirect
3940
github.com/RoaringBitmap/roaring v1.9.4 // indirect
40-
github.com/alecthomas/chroma/v2 v2.15.0 // indirect
41+
github.com/alecthomas/chroma/v2 v2.17.0 // indirect
4142
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
4243
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
4344
github.com/beorn7/perks v1.0.1 // indirect
44-
github.com/bits-and-blooms/bitset v1.20.0 // indirect
45+
github.com/bits-and-blooms/bitset v1.22.0 // indirect
4546
github.com/caddyserver/zerossl v0.1.3 // indirect
47+
github.com/ccoveille/go-safecast v1.6.1 // indirect
4648
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
4749
github.com/cespare/xxhash v1.1.0 // indirect
4850
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4951
github.com/chzyer/readline v1.5.1 // indirect
50-
github.com/coreos/go-oidc/v3 v3.12.0 // indirect
52+
github.com/cloudflare/circl v1.6.1 // indirect
53+
github.com/coreos/go-oidc/v3 v3.14.1 // indirect
5154
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
5255
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5356
github.com/dgraph-io/badger v1.6.2 // indirect
@@ -56,72 +59,72 @@ require (
5659
github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da // indirect
5760
github.com/dlclark/regexp2 v1.11.5 // indirect
5861
github.com/dolthub/maphash v0.1.0 // indirect
59-
github.com/dunglas/httpsfv v1.0.2 // indirect
62+
github.com/dunglas/httpsfv v1.1.0 // indirect
6063
github.com/dunglas/mercure v0.18.4 // indirect
61-
github.com/dunglas/vulcain v1.1.1 // indirect
64+
github.com/dunglas/vulcain v1.2.0 // indirect
6265
github.com/dustin/go-humanize v1.0.1 // indirect
6366
github.com/felixge/httpsnoop v1.0.4 // indirect
6467
github.com/francoispqt/gojay v1.2.13 // indirect
65-
github.com/fsnotify/fsnotify v1.8.0 // indirect
66-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
68+
github.com/fsnotify/fsnotify v1.9.0 // indirect
69+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
6770
github.com/gammazero/deque v1.0.0 // indirect
68-
github.com/getkin/kin-openapi v0.128.0 // indirect
69-
github.com/go-chi/chi/v5 v5.2.0 // indirect
70-
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
71-
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
71+
github.com/getkin/kin-openapi v0.131.0 // indirect
72+
github.com/go-chi/chi/v5 v5.2.1 // indirect
73+
github.com/go-jose/go-jose/v3 v3.0.4 // indirect
74+
github.com/go-jose/go-jose/v4 v4.1.0 // indirect
7275
github.com/go-logr/logr v1.4.2 // indirect
7376
github.com/go-logr/stdr v1.2.2 // indirect
74-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
75-
github.com/go-openapi/swag v0.23.0 // indirect
76-
github.com/go-sql-driver/mysql v1.9.0 // indirect
77+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
78+
github.com/go-openapi/swag v0.23.1 // indirect
79+
github.com/go-sql-driver/mysql v1.9.2 // indirect
7780
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
81+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
7882
github.com/gofrs/uuid v4.4.0+incompatible // indirect
79-
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
83+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
8084
github.com/golang/protobuf v1.5.4 // indirect
81-
github.com/golang/snappy v0.0.4 // indirect
82-
github.com/google/brotli/go/cbrotli v0.0.0-20241111155135-4303850b01d6 // indirect
83-
github.com/google/cel-go v0.23.2 // indirect
84-
github.com/google/certificate-transparency-go v1.3.0 // indirect
85+
github.com/golang/snappy v1.0.0 // indirect
86+
github.com/google/brotli/go/cbrotli v0.0.0-20250131134309-440e03642b89 // indirect
87+
github.com/google/cel-go v0.24.1 // indirect
88+
github.com/google/certificate-transparency-go v1.3.1 // indirect
8589
github.com/google/go-tpm v0.9.3 // indirect
8690
github.com/google/go-tspi v0.3.0 // indirect
87-
github.com/google/pprof v0.0.0-20250208200701-d0013a598941 // indirect
91+
github.com/google/pprof v0.0.0-20250418163039-24c5476c6587 // indirect
8892
github.com/google/uuid v1.6.0 // indirect
8993
github.com/gorilla/handlers v1.5.2 // indirect
9094
github.com/gorilla/mux v1.8.1 // indirect
91-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
95+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
9296
github.com/hashicorp/golang-lru v1.0.2 // indirect
93-
github.com/hashicorp/hcl v1.0.0 // indirect
9497
github.com/huandu/xstrings v1.5.0 // indirect
9598
github.com/inconshreveable/mousetrap v1.1.0 // indirect
96-
github.com/invopop/yaml v0.3.1 // indirect
9799
github.com/jackc/pgpassfile v1.0.0 // indirect
98100
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
99-
github.com/jackc/pgx/v5 v5.7.2 // indirect
101+
github.com/jackc/pgx/v5 v5.7.4 // indirect
100102
github.com/jackc/puddle/v2 v2.2.2 // indirect
101103
github.com/josharian/intern v1.0.0 // indirect
102104
github.com/kevburnsjr/skipfilter v0.0.1 // indirect
103105
github.com/klauspost/compress v1.18.0 // indirect
104106
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
105107
github.com/kylelemons/godebug v1.1.0 // indirect
106-
github.com/libdns/libdns v0.2.3 // indirect
107-
github.com/magiconair/properties v1.8.9 // indirect
108+
github.com/libdns/libdns v1.0.0-beta.1 // indirect
108109
github.com/mailru/easyjson v0.9.0 // indirect
109110
github.com/manifoldco/promptui v0.9.0 // indirect
110111
github.com/mattn/go-colorable v0.1.14 // indirect
111112
github.com/mattn/go-isatty v0.0.20 // indirect
112113
github.com/maypok86/otter v1.2.4 // indirect
113114
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
114-
github.com/mholt/acmez/v3 v3.1.0 // indirect
115-
github.com/miekg/dns v1.1.63 // indirect
115+
github.com/mholt/acmez/v3 v3.1.2 // indirect
116+
github.com/miekg/dns v1.1.65 // indirect
116117
github.com/mitchellh/copystructure v1.2.0 // indirect
117118
github.com/mitchellh/go-ps v1.0.0 // indirect
118-
github.com/mitchellh/mapstructure v1.5.0 // indirect
119119
github.com/mitchellh/reflectwalk v1.0.2 // indirect
120120
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
121121
github.com/mschoch/smat v0.2.0 // indirect
122122
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
123-
github.com/onsi/ginkgo/v2 v2.22.2 // indirect
124-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
123+
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
124+
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
125+
github.com/onsi/ginkgo/v2 v2.23.4 // indirect
126+
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
127+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
125128
github.com/perimeterx/marshmallow v1.1.5 // indirect
126129
github.com/pires/go-proxyproto v0.8.0 // indirect
127130
github.com/pkg/errors v0.9.1 // indirect
@@ -130,26 +133,26 @@ require (
130133
github.com/prometheus/common v0.63.0 // indirect
131134
github.com/prometheus/procfs v0.16.1 // indirect
132135
github.com/quic-go/qpack v0.5.1 // indirect
133-
github.com/quic-go/quic-go v0.49.0 // indirect
136+
github.com/quic-go/quic-go v0.51.0 // indirect
134137
github.com/rs/xid v1.6.0 // indirect
135138
github.com/russross/blackfriday/v2 v2.1.0 // indirect
136-
github.com/sagikazarmark/locafero v0.7.0 // indirect
137-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
139+
github.com/sagikazarmark/locafero v0.9.0 // indirect
138140
github.com/shopspring/decimal v1.4.0 // indirect
139141
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
140142
github.com/sirupsen/logrus v1.9.3 // indirect
141-
github.com/slackhq/nebula v1.9.4 // indirect
142-
github.com/smallstep/certificates v0.28.1 // indirect
143-
github.com/smallstep/cli-utils v0.10.0 // indirect
143+
github.com/slackhq/nebula v1.9.5 // indirect
144+
github.com/smallstep/certificates v0.28.3 // indirect
145+
github.com/smallstep/cli-utils v0.12.1 // indirect
146+
github.com/smallstep/linkedca v0.23.0 // indirect
144147
github.com/smallstep/nosql v0.7.0 // indirect
145148
github.com/smallstep/pkcs7 v0.2.1 // indirect
146-
github.com/smallstep/scep v0.0.0-20241223071629-a37a330173bc // indirect
149+
github.com/smallstep/scep v0.0.0-20250318231241-a25cabb69492 // indirect
147150
github.com/smallstep/truststore v0.13.0 // indirect
148151
github.com/sourcegraph/conc v0.3.0 // indirect
149-
github.com/spf13/afero v1.12.0 // indirect
152+
github.com/spf13/afero v1.14.0 // indirect
150153
github.com/spf13/cast v1.7.1 // indirect
151154
github.com/spf13/pflag v1.0.6 // indirect
152-
github.com/spf13/viper v1.19.0 // indirect
155+
github.com/spf13/viper v1.20.1 // indirect
153156
github.com/stoewer/go-strcase v1.3.0 // indirect
154157
github.com/subosito/gotenv v1.6.0 // indirect
155158
github.com/tailscale/tscert v0.0.0-20240608151842-d3f834017e53 // indirect
@@ -161,47 +164,46 @@ require (
161164
github.com/urfave/cli v1.22.16 // indirect
162165
github.com/x448/float16 v0.8.4 // indirect
163166
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
164-
github.com/yuin/goldmark v1.7.8 // indirect
167+
github.com/yuin/goldmark v1.7.10 // indirect
165168
github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc // indirect
166169
github.com/zeebo/blake3 v0.2.4 // indirect
167170
go.etcd.io/bbolt v1.4.0 // indirect
168171
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
169-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
170-
go.opentelemetry.io/contrib/propagators/autoprop v0.58.0 // indirect
171-
go.opentelemetry.io/contrib/propagators/aws v1.33.0 // indirect
172-
go.opentelemetry.io/contrib/propagators/b3 v1.33.0 // indirect
173-
go.opentelemetry.io/contrib/propagators/jaeger v1.33.0 // indirect
174-
go.opentelemetry.io/contrib/propagators/ot v1.33.0 // indirect
175-
go.opentelemetry.io/otel v1.33.0 // indirect
176-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
177-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
178-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
179-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
180-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
181-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
182-
go.step.sm/crypto v0.57.1 // indirect
183-
go.step.sm/linkedca v0.22.2 // indirect
172+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
173+
go.opentelemetry.io/contrib/propagators/autoprop v0.60.0 // indirect
174+
go.opentelemetry.io/contrib/propagators/aws v1.35.0 // indirect
175+
go.opentelemetry.io/contrib/propagators/b3 v1.35.0 // indirect
176+
go.opentelemetry.io/contrib/propagators/jaeger v1.35.0 // indirect
177+
go.opentelemetry.io/contrib/propagators/ot v1.35.0 // indirect
178+
go.opentelemetry.io/otel v1.35.0 // indirect
179+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
180+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 // indirect
181+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
182+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
183+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
184+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
185+
go.step.sm/crypto v0.61.0 // indirect
184186
go.uber.org/automaxprocs v1.6.0 // indirect
185-
go.uber.org/mock v0.5.0 // indirect
187+
go.uber.org/mock v0.5.1 // indirect
186188
go.uber.org/multierr v1.11.0 // indirect
187189
go.uber.org/zap/exp v0.3.0 // indirect
188190
golang.org/x/crypto v0.37.0 // indirect
189-
golang.org/x/crypto/x509roots/fallback v0.0.0-20250214233241-911360c8a4f4 // indirect
190-
golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect
191+
golang.org/x/crypto/x509roots/fallback v0.0.0-20250418111936-9c1aa6af88df // indirect
192+
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
191193
golang.org/x/mod v0.24.0 // indirect
192194
golang.org/x/net v0.39.0 // indirect
193-
golang.org/x/oauth2 v0.26.0 // indirect
195+
golang.org/x/oauth2 v0.29.0 // indirect
194196
golang.org/x/sync v0.13.0 // indirect
195197
golang.org/x/sys v0.32.0 // indirect
196198
golang.org/x/term v0.31.0 // indirect
197199
golang.org/x/text v0.24.0 // indirect
198-
golang.org/x/time v0.10.0 // indirect
199-
golang.org/x/tools v0.31.0 // indirect
200-
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
201-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
202-
google.golang.org/grpc v1.70.0 // indirect
200+
golang.org/x/time v0.11.0 // indirect
201+
golang.org/x/tools v0.32.0 // indirect
202+
google.golang.org/genproto/googleapis/api v0.0.0-20250421163800-61c742ae3ef0 // indirect
203+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250421163800-61c742ae3ef0 // indirect
204+
google.golang.org/grpc v1.72.0 // indirect
205+
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 // indirect
203206
google.golang.org/protobuf v1.36.6 // indirect
204-
gopkg.in/ini.v1 v1.67.0 // indirect
205207
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
206208
gopkg.in/yaml.v3 v3.0.1 // indirect
207209
howett.net/plist v1.0.1 // indirect

0 commit comments

Comments
 (0)