When copying headers from context copy by value instead of reference (#…

…94) Signed-off-by: Scott Nichols <nicholss@google.com>
cloudevents · Mar 27, 2019 · e00e75c · e00e75c
1 parent b88e53e
commit e00e75c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pkg/cloudevents/transport/http/context.go b/pkg/cloudevents/transport/http/context.go
@@ -147,11 +147,12 @@ func ContextWithHeader(ctx context.Context, key, value string) context.Context {
 
 // HeaderFrom extracts the header oject in the given context. Always returns a non-nil Header.
 func HeaderFrom(ctx context.Context) http.Header {
+	ch := http.Header{}
 	header := ctx.Value(headerKey)
 	if header != nil {
 		if h, ok := header.(http.Header); ok {
-			return h
+			copyHeaders(h, ch)
 		}
 	}
-	return http.Header{}
+	return ch
 }
diff --git a/pkg/cloudevents/transport/http/transport.go b/pkg/cloudevents/transport/http/transport.go
@@ -163,9 +163,11 @@ func (t *Transport) obsSend(ctx context.Context, event cloudevents.Event) (*clou
 
 	if m, ok := msg.(*Message); ok {
 		copyHeaders(m.Header, req.Header)
+
 		req.Body = ioutil.NopCloser(bytes.NewBuffer(m.Body))
 		req.ContentLength = int64(len(m.Body))
 		req.Close = true
+
 		return httpDo(ctx, t.Client, &req, func(resp *http.Response, err error) (*cloudevents.Event, error) {
 			if err != nil {
 				return nil, err