Skip to content

Commit 49d2e62

Browse files
dunglasdunglas
authored
chore: bump Mercure and downgrade cbrotli (#1525)
* chore: bump Mercure * downgrade cbrotli
1 parent 8febee7 commit 49d2e62

2 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎caddy/go.mod‎

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

3-
go 1.24
3+
go 1.24.0
44

55
toolchain go1.24.2
66

@@ -13,7 +13,7 @@ require (
1313
github.com/caddyserver/certmagic v0.23.0
1414
github.com/dunglas/caddy-cbrotli v1.0.0
1515
github.com/dunglas/frankenphp v1.5.0
16-
github.com/dunglas/mercure/caddy v0.18.4
16+
github.com/dunglas/mercure/caddy v0.19.0
1717
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
@@ -60,7 +60,7 @@ require (
6060
github.com/dlclark/regexp2 v1.11.5 // indirect
6161
github.com/dolthub/maphash v0.1.0 // indirect
6262
github.com/dunglas/httpsfv v1.1.0 // indirect
63-
github.com/dunglas/mercure v0.18.4 // indirect
63+
github.com/dunglas/mercure v0.19.0 // indirect
6464
github.com/dunglas/vulcain v1.2.0 // indirect
6565
github.com/dustin/go-humanize v1.0.1 // indirect
6666
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -83,12 +83,12 @@ require (
8383
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
8484
github.com/golang/protobuf v1.5.4 // indirect
8585
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
86+
github.com/google/brotli/go/cbrotli v0.0.0-20241111155135-4303850b01d6 // indirect
87+
github.com/google/cel-go v0.25.0 // indirect
8888
github.com/google/certificate-transparency-go v1.3.1 // indirect
8989
github.com/google/go-tpm v0.9.3 // indirect
9090
github.com/google/go-tspi v0.3.0 // indirect
91-
github.com/google/pprof v0.0.0-20250418163039-24c5476c6587 // indirect
91+
github.com/google/pprof v0.0.0-20250422154841-e1f9c1950416 // indirect
9292
github.com/google/uuid v1.6.0 // indirect
9393
github.com/gorilla/handlers v1.5.2 // indirect
9494
github.com/gorilla/mux v1.8.1 // indirect
@@ -199,8 +199,8 @@ require (
199199
golang.org/x/text v0.24.0 // indirect
200200
golang.org/x/time v0.11.0 // indirect
201201
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
202+
google.golang.org/genproto/googleapis/api v0.0.0-20250422160041-2d3770c4ea7f // indirect
203+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250422160041-2d3770c4ea7f // indirect
204204
google.golang.org/grpc v1.72.0 // indirect
205205
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 // indirect
206206
google.golang.org/protobuf v1.36.6 // indirect

‎caddy/go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,10 @@ github.com/dunglas/caddy-cbrotli v1.0.0 h1:+WNqXBkWyMcIpXB2rVZ3nwcElUbuAzf0kPxNX
168168
github.com/dunglas/caddy-cbrotli v1.0.0/go.mod h1:KZsUu3fnQBgO0o3YDoQuO3Z61dFgUncr1F8rg8acwQw=
169169
github.com/dunglas/httpsfv v1.1.0 h1:Jw76nAyKWKZKFrpMMcL76y35tOpYHqQPzHQiwDvpe54=
170170
github.com/dunglas/httpsfv v1.1.0/go.mod h1:zID2mqw9mFsnt7YC3vYQ9/cjq30q41W+1AnDwH8TiMg=
171-
github.com/dunglas/mercure v0.18.4 h1:fhi1t1LIK2EqIDAMHSMH1lpmZTUu5hLXykXbJ718vp0=
172-
github.com/dunglas/mercure v0.18.4/go.mod h1:J/WQtiI31VacQJ1CBV1pqisKzPjoxIaZ9ZUSyhctKas=
173-
github.com/dunglas/mercure/caddy v0.18.4 h1:uxG50dbnsgNaDAlHX+8Y1b62ZvEcw1eHt5LrC6as0nQ=
174-
github.com/dunglas/mercure/caddy v0.18.4/go.mod h1:187W43Uae6s+bga5NJ8p+07Avbj3UsT78wA7/+3KMEw=
171+
github.com/dunglas/mercure v0.19.0 h1:GGi0Q1u864/i6g3UoHoFb2ulKdsl22BB1cy4b/pHl3k=
172+
github.com/dunglas/mercure v0.19.0/go.mod h1:T+jHRIkAw/yKQuBNHBROj93dPhjQDfNHNOehGci4P8U=
173+
github.com/dunglas/mercure/caddy v0.19.0 h1:FBwJ88lnkyVUsG4c3RlVfDDy9f3Q3B28LfzaEzJIhGs=
174+
github.com/dunglas/mercure/caddy v0.19.0/go.mod h1:DKdo9FfA5pfr16/ZfRSlJ8lgaZ5dmrIkIFRCb3OQ/zU=
175175
github.com/dunglas/vulcain v1.2.0 h1:RPNYuTe0woh4bGfIMAJ3dCgJDN8VJwhDjucQiCOoUsE=
176176
github.com/dunglas/vulcain v1.2.0/go.mod h1:LhyYeqSAEw9P65l25CIzS1sRwJxkP75Qa7p8lIHZPsc=
177177
github.com/dunglas/vulcain/caddy v1.2.0 h1:2O2R7Hn+kkInv6mrmOk5LLDtgRdPKGlXzdFJUKrb/jE=
@@ -237,13 +237,13 @@ github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6
237237
github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
238238
github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
239239
github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
240-
github.com/google/brotli/go/cbrotli v0.0.0-20250131134309-440e03642b89 h1:uTi61Z6B5ROLqhx+kKoZ1l0+Nw5GWKpqcgjaPQQYsUs=
241-
github.com/google/brotli/go/cbrotli v0.0.0-20250131134309-440e03642b89/go.mod h1:nOPhAkwVliJdNTkj3gXpljmWhjc4wCaVqbMJcPKWP4s=
240+
github.com/google/brotli/go/cbrotli v0.0.0-20241111155135-4303850b01d6 h1:ygfAzuHUP3wed0um8AamwtZIh022Ie5lnsWHhItj/sY=
241+
github.com/google/brotli/go/cbrotli v0.0.0-20241111155135-4303850b01d6/go.mod h1:nOPhAkwVliJdNTkj3gXpljmWhjc4wCaVqbMJcPKWP4s=
242242
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
243243
github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
244244
github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
245-
github.com/google/cel-go v0.24.1 h1:jsBCtxG8mM5wiUJDSGUqU0K7Mtr3w7Eyv00rw4DiZxI=
246-
github.com/google/cel-go v0.24.1/go.mod h1:Hdf9TqOaTNSFQA1ybQaRqATVoK7m/zcf7IMhGXP5zI8=
245+
github.com/google/cel-go v0.25.0 h1:jsFw9Fhn+3y2kBbltZR4VEz5xKkcIFRPDnuEzAGv5GY=
246+
github.com/google/cel-go v0.25.0/go.mod h1:hjEb6r5SuOSlhCHmFoLzu8HGCERvIsDAbxDAyNU/MmI=
247247
github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg=
248248
github.com/google/certificate-transparency-go v1.3.1 h1:akbcTfQg0iZlANZLn0L9xOeWtyCIdeoYhKrqi5iH3Go=
249249
github.com/google/certificate-transparency-go v1.3.1/go.mod h1:gg+UQlx6caKEDQ9EElFOujyxEQEfOiQzAt6782Bvi8k=
@@ -262,8 +262,8 @@ github.com/google/go-tspi v0.3.0 h1:ADtq8RKfP+jrTyIWIZDIYcKOMecRqNJFOew2IT0Inus=
262262
github.com/google/go-tspi v0.3.0/go.mod h1:xfMGI3G0PhxCdNVcYr1C4C+EizojDg/TXuX5by8CiHI=
263263
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
264264
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
265-
github.com/google/pprof v0.0.0-20250418163039-24c5476c6587 h1:b/8HpQhvKLSNzH5oTXN2WkNcMl6YB5K3FRbb+i+Ml34=
266-
github.com/google/pprof v0.0.0-20250418163039-24c5476c6587/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
265+
github.com/google/pprof v0.0.0-20250422154841-e1f9c1950416 h1:1/qwHx8P72glDXdyCKesJ+/c40x71SY4q2avOxJ2iYQ=
266+
github.com/google/pprof v0.0.0-20250422154841-e1f9c1950416/go.mod h1:5hDyRhoBCxViHszMt12TnOpEI4VVi+U8Gm9iphldiMA=
267267
github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
268268
github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
269269
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -750,10 +750,10 @@ google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk
750750
google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
751751
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb h1:ITgPrl429bc6+2ZraNSzMDk3I95nmQln2fuPstKwFDE=
752752
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:sAo5UzpjUwgFBCzupwhcLcxHVDK7vG5IqI30YnwX2eE=
753-
google.golang.org/genproto/googleapis/api v0.0.0-20250421163800-61c742ae3ef0 h1:bphwUhSYYbcKacmc2crgiMvwARwqeNCtAI5g1PohT34=
754-
google.golang.org/genproto/googleapis/api v0.0.0-20250421163800-61c742ae3ef0/go.mod h1:Cd8IzgPo5Akum2c9R6FsXNaZbH3Jpa2gpHlW89FqlyQ=
755-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250421163800-61c742ae3ef0 h1:l7lvb5BMqtbmd7fibSq7fi956Fv9/sqiwI9qOw8ltCo=
756-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250421163800-61c742ae3ef0/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
753+
google.golang.org/genproto/googleapis/api v0.0.0-20250422160041-2d3770c4ea7f h1:tjZsroqekhC63+WMqzmWyW5Twj/ZfR5HAlpd5YQ1Vs0=
754+
google.golang.org/genproto/googleapis/api v0.0.0-20250422160041-2d3770c4ea7f/go.mod h1:Cd8IzgPo5Akum2c9R6FsXNaZbH3Jpa2gpHlW89FqlyQ=
755+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250422160041-2d3770c4ea7f h1:N/PrbTw4kdkqNRzVfWPrBekzLuarFREcbFOiOLkXon4=
756+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250422160041-2d3770c4ea7f/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
757757
google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
758758
google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
759759
google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=

0 commit comments

Comments
 (0)