Skip to content

fix(handler): adapt to api-go beta.5 HttpHeaderValue.values string type #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rustatian merged 1 commit into from
May 10, 2026
Merged

fix(handler): adapt to api-go beta.5 HttpHeaderValue.values string type #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/mholt/acmez v1.2.0
github.com/prometheus/client_golang v1.23.2
github.com/quic-go/quic-go v0.59.0
github.com/roadrunner-server/api-go/v6 v6.0.0-beta.4
github.com/roadrunner-server/api-go/v6 v6.0.0-beta.5
github.com/roadrunner-server/api-plugins/v6 v6.0.0-beta.2
github.com/roadrunner-server/context v1.3.0
github.com/roadrunner-server/endure/v2 v2.6.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=
github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII=
github.com/quic-go/quic-go v0.59.0 h1:OLJkp1Mlm/aS7dpKgTc6cnpynnD2Xg7C1pwL6vy/SAw=
github.com/quic-go/quic-go v0.59.0/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU=
github.com/roadrunner-server/api-go/v6 v6.0.0-beta.4 h1:wX8IezPUeeBJzlzaBEFSZBE5Bc/Le1Uf/GdFRdFO3HQ=
github.com/roadrunner-server/api-go/v6 v6.0.0-beta.4/go.mod h1:jI30i64yCAxJh7KHc8e1B8NgDcvcnSTI1OIK8lTE+Y0=
github.com/roadrunner-server/api-go/v6 v6.0.0-beta.5 h1:4x17K8qmxIbtKrCKoY1NR7bBvJbrB7w0P/0ovYR8C6E=
github.com/roadrunner-server/api-go/v6 v6.0.0-beta.5/go.mod h1:B9CjHMnKrAUNM99XckiA8NEKg0oid22KqejR+lRnohw=
github.com/roadrunner-server/api-plugins/v6 v6.0.0-beta.2 h1:GqsZzWQ5jMXRF1O/b8IqFz9PLpS7Ui0K4OyACLql2MI=
github.com/roadrunner-server/api-plugins/v6 v6.0.0-beta.2/go.mod h1:2v4yUK5Kvbvq8C3IkDoBkuamq9h+7i/JLjyf7k1j5JM=
github.com/roadrunner-server/context v1.3.0 h1:iyTXVORhPU2/26z7kdzEaggwG5P8yhIKUDLiePjylFQ=
Expand Down
1 change: 1 addition & 0 deletions go.work.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2741,6 +2741,7 @@ go.temporal.io/api v1.30.0/go.mod h1:PIZ+UyGTMh3HJFauMysfanNBAh3f0jRf1xydrhTEcSQ
go.temporal.io/api v1.57.0/go.mod h1:iaxoP/9OXMJcQkETTECfwYq4cw/bj4nwov8b3ZLVnXM=
go.temporal.io/api v1.62.2 h1:jFhIzlqNyJsJZTiCRQmTIMv6OTQ5BZ57z8gbgLGMaoo=
go.temporal.io/api v1.62.2/go.mod h1:iaxoP/9OXMJcQkETTECfwYq4cw/bj4nwov8b3ZLVnXM=
go.temporal.io/api v1.62.11/go.mod h1:iaxoP/9OXMJcQkETTECfwYq4cw/bj4nwov8b3ZLVnXM=
go.temporal.io/sdk v1.26.0-rc.2 h1:0NX4wR2qwD6xCv+JNhZdViamsITMYWzZkUqBJEIVHBw=
go.temporal.io/sdk v1.26.0-rc.2/go.mod h1:HDr8fIWJ/HF8dJwTPgOayI8PYB5WoVIxUMjzE78M2ng=
go.temporal.io/sdk/contrib/opentelemetry v0.4.0 h1:Ddx+39cESh4CNFI6cy8TI1OBJC8MUQUDzt6TpIJJjPQ=
Expand Down
6 changes: 2 additions & 4 deletions handler/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ func convert(headers http.Header) map[string]*httpV2proto.HttpHeaderValue {
resp[k] = &httpV2proto.HttpHeaderValue{}
}

for _, vv := range v {
resp[k].Values = append(resp[k].GetValues(), []byte(vv))
}
resp[k].Values = append(resp[k].GetValues(), v...)
}

return resp
Expand All @@ -38,7 +36,7 @@ func convertCookies(headers map[string]string) map[string]*httpV2proto.HttpHeade
resp[k] = &httpV2proto.HttpHeaderValue{}
}

resp[k].Values = append(resp[k].GetValues(), []byte(v))
resp[k].Values = append(resp[k].GetValues(), v)
}

return resp
Expand Down
10 changes: 5 additions & 5 deletions handler/response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func (h *Handler) handlePROTOresponse(pld *payload.Payload, w http.ResponseWrite

if pusher, ok := w.(http.Pusher); ok {
for _, pushVal := range push {
err = pusher.Push(string(pushVal), nil)
err = pusher.Push(pushVal, nil)
if err != nil {
return err
}
Expand All @@ -67,9 +67,9 @@ func (h *Handler) handlePROTOresponse(pld *payload.Payload, w http.ResponseWrite
}

// write all headers from the response to the writer
for k := range rsp.GetHeaders() {
for kk := range rsp.GetHeaders()[k].GetValues() {
w.Header().Add(k, string(rsp.GetHeaders()[k].GetValues()[kk]))
for k, hv := range rsp.GetHeaders() {
for _, v := range hv.GetValues() {
w.Header().Add(k, v)
}
}

Expand Down Expand Up @@ -101,7 +101,7 @@ func (h *Handler) handlePROTOresponse(pld *payload.Payload, w http.ResponseWrite

func handleProtoTrailers(h map[string]*httpV2proto.HttpHeaderValue) {
for _, tr := range h[Trailer].GetValues() {
for n := range strings.SplitSeq(string(tr), ",") {
for n := range strings.SplitSeq(tr, ",") {
n = strings.Trim(n, "\t ")
if v, ok := h[n]; ok {
h["Trailer:"+n] = v
Expand Down
Loading