Merge pull request #93 from sendgrid/header-overwrite-bug

thinkingserious · web-flow · commit f3078744e297 · 2018-03-11T08:33:52.000-07:00
Don't overwrite headers set from upstream dependencies
diff --git a/lib/Client.php b/lib/Client.php
@@ -192,7 +192,7 @@ private function createCurlOptions($method, $body = null, $headers = null)
         if (isset($headers)) {
             $headers = array_merge($this->headers, $headers);
         } else {
-            $headers = [];
+            $headers = $this->headers;
         }
 
         if (isset($body)) {

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ private function createCurlOptions($method, $body = null, $headers = null)`
`192`	`192`	`if (isset($headers)) {`
`193`	`193`	`$headers = array_merge($this->headers, $headers);`
`194`	`194`	`} else {`
`195`		`- $headers = [];`
	`195`	`+ $headers = $this->headers;`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`if (isset($body)) {`