Swap merging priority

biglittlebigben · biglittlebigben · commit d389b310f309 · 2025-12-04T07:37:07.000-08:00
diff --git a/auth.go b/auth.go
@@ -64,13 +64,14 @@ func (b authBase) withAuth(ctx context.Context, opt authOption, options ...authO
 
 	h := signalling.NewHTTPHeaderWithToken(token)
 	ctxH, _ := twirp.HTTPRequestHeaders(ctx)
+	ctxH = ctxH.Clone()
 
 	// merge new header with the ones already present in the context
-	for k, vv := range ctxH {
+	for k, vv := range h {
 		for _, v := range vv {
-			h.Add(k, v)
+			ctxH.Add(k, v)
 		}
 	}
 
-	return twirp.WithHTTPRequestHeaders(ctx, h)
+	return twirp.WithHTTPRequestHeaders(ctx, ctxH)
 }

Original file line number	Diff line number	Diff line change
`@@ -64,13 +64,14 @@ func (b authBase) withAuth(ctx context.Context, opt authOption, options ...authO`
`64`	`64`
`65`	`65`	`h := signalling.NewHTTPHeaderWithToken(token)`
`66`	`66`	`ctxH, _ := twirp.HTTPRequestHeaders(ctx)`
	`67`	`+ ctxH = ctxH.Clone()`
`67`	`68`
`68`	`69`	`// merge new header with the ones already present in the context`
`69`		`- for k, vv := range ctxH {`
	`70`	`+ for k, vv := range h {`
`70`	`71`	`for _, v := range vv {`
`71`		`- h.Add(k, v)`
	`72`	`+ ctxH.Add(k, v)`
`72`	`73`	`}`
`73`	`74`	`}`
`74`	`75`
`75`		`- return twirp.WithHTTPRequestHeaders(ctx, h)`
	`76`	`+ return twirp.WithHTTPRequestHeaders(ctx, ctxH)`
`76`	`77`	`}`