From 18e74ac51f707ceecbf268573e23078306aafd53 Mon Sep 17 00:00:00 2001
From: DaVinciEngineer <DaVinciEngineer@users.noreply.github.com>
Date: Wed, 4 Jan 2017 18:08:40 +0100
Subject: [PATCH] Headers should win if they are provided when converting Psr7
 request to Cake request

---
 src/Http/RequestTransformer.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Http/RequestTransformer.php b/src/Http/RequestTransformer.php
index 7b03993c247..ab4b23e2a03 100644
--- a/src/Http/RequestTransformer.php
+++ b/src/Http/RequestTransformer.php
@@ -41,6 +41,14 @@ public static function toCake(PsrRequest $request)
     {
         $post = $request->getParsedBody();
         $server = $request->getServerParams();
+        $headers = $request->getHeaders();
+
+        foreach ($headers as $k => $value) {
+            $name = sprintf('HTTP_%s', strtoupper(str_replace('-', '_', $k)));
+            if (isset($server[$name])) {
+                $server[$name] = $value[0];
+            }
+        }
 
         $files = static::getFiles($request);
         if (!empty($files)) {