Merge pull request #98 from RusinovIG/master

Issue with priority of headers
Kong · Mar 23, 2016 · c01f685 · c01f685
2 parents 2bedcf0 + 28080c9
commit c01f685
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
+.idea
 build
 composer.lock
 composer.phar

diff --git a/src/Unirest/Request.php b/src/Unirest/Request.php
@@ -504,7 +504,7 @@ public static function getFormattedHeaders($headers)
     {
         $formattedHeaders = array();
 
-        $combinedHeaders = array_change_key_case(array_merge((array) $headers, self::$defaultHeaders));
+        $combinedHeaders = array_change_key_case(array_merge(self::$defaultHeaders, (array) $headers));
 
         foreach ($combinedHeaders as $key => $val) {
             $formattedHeaders[] = self::getHeaderString($key, $val);

diff --git a/tests/Unirest/RequestTest.php b/tests/Unirest/RequestTest.php
@@ -48,6 +48,12 @@ public function testDefaultHeaders()
         $this->assertObjectHasAttribute('header2', $response->body->headers);
         $this->assertEquals('world', $response->body->headers->header2);
 
+        $response = Request::get('http://mockbin.com/request', ['header1' => 'Custom value']);
+
+        $this->assertEquals(200, $response->code);
+        $this->assertObjectHasAttribute('header1', $response->body->headers);
+        $this->assertEquals('Custom value', $response->body->headers->header1);
+
         Request::clearDefaultHeaders();
 
         $response = Request::get('http://mockbin.com/request');