Prefer http.Header over map[string]string to allow for multi-valued headers

This commit is contained in:
Conor Mongey 2021-01-05 15:55:38 +00:00
parent cdc8cd7b0e
commit f647569b84
No known key found for this signature in database
GPG Key ID: 5C886ACC44EB17C0
2 changed files with 5 additions and 6 deletions

View File

@ -315,7 +315,7 @@ type Config struct {
TLSConfig TLSConfig
Headers map[string]string
Header http.Header
}
// TLSConfig is used to generate a TLSClientConfig that's useful for talking to
@ -858,9 +858,8 @@ func (c *Client) newRequest(method, path string) *request {
header: make(http.Header),
}
for k, v := range c.config.Headers {
r.header.Set(k, v)
}
r.header = c.config.Header
if c.config.Datacenter != "" {
r.params.Set("dc", c.config.Datacenter)
}

View File

@ -811,8 +811,8 @@ func TestAPI_SetWriteOptions(t *testing.T) {
func TestAPI_Headers(t *testing.T) {
t.Parallel()
c, s := makeClientWithConfig(t, func(c *Config) {
c.Headers = map[string]string{
"Hello": "World",
c.Header = http.Header{
"Hello": []string{"World"},
}
}, nil)
defer s.Stop()