Merge branch 'feature/161' into develop

Close #161
Fixes #160

Author: weierophinney

CHANGELOG.md

@@ -10,6 +10,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Changed
 
+- [#161](https://github.com/zendframework/zend-http/pull/161) changes how the Socket and Test adapters aggregate headers. Previously,
+  they would `ucfirst()` the header name; now, they correctly leave the header
+  names untouched, as header names should be considered case-insensitive.
+
 - [#156](https://github.com/zendframework/zend-http/pull/156) changes how gzip and deflate decompression occur in responses, ensuring
   that if the Content-Length header reports 0, no decompression is attempted,
   and an empty string is returned.

src/Client/Adapter/Socket.php

@@ -389,7 +389,7 @@ public function write($method, $uri, $httpVer = '1.1', $headers = [], $body = ''
         $request = $method . ' ' . $path . ' HTTP/' . $httpVer . "\r\n";
         foreach ($headers as $k => $v) {
             if (is_string($k)) {
-                $v = ucfirst($k) . ': ' . $v;
+                $v = $k . ': ' . $v;
             }
             $request .= $v . "\r\n";
         }

src/Client/Adapter/Test.php

@@ -132,7 +132,7 @@ public function write($method, $uri, $httpVer = '1.1', $headers = [], $body = ''
         $request = $method . ' ' . $path . ' HTTP/' . $httpVer . "\r\n";
         foreach ($headers as $k => $v) {
             if (is_string($k)) {
-                $v = ucfirst($k) . ': ' . $v;
+                $v = $k . ': ' . $v;
             }
             $request .= $v . "\r\n";
         }

test/Client/SocketTest.php

@@ -339,6 +339,24 @@ public function testAllowsZeroWrittenBytes()
         $this->_adapter->write('GET', new Uri('tcp://localhost:80/'), '1.1', [], 'test body');
     }
 
+    /**
+     * Verifies that the headers are being set as given without changing any
+     * character case.
+     */
+    public function testCaseInsensitiveHeaders()
+    {
+        $this->_adapter->connect('localhost');
+        $requestString = $this->_adapter->write(
+            'GET',
+            new Uri('tcp://localhost:80/'),
+            '1.1',
+            ['x-test-header' => 'someTestHeader'],
+            'someTestBody'
+        );
+
+        $this->assertContains('x-test-header', $requestString);
+    }
+
     /**
      * Data Providers
      */