From 271012226000203556fe95119b553cc79ed73c63 Mon Sep 17 00:00:00 2001
From: Fernando Castillo <contact@fcastillo.es>
Date: Mon, 4 Sep 2017 19:32:09 +0200
Subject: [PATCH] Fix response headers format

---
 src/Api/Mapper/CompactPayloadMapper.php  | 2 +-
 src/Api/Mapper/ExtendedPayloadMapper.php | 2 +-
 src/Api/Protocol/Http/HttpResponse.php   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Api/Mapper/CompactPayloadMapper.php b/src/Api/Mapper/CompactPayloadMapper.php
index 8ba5949..700e2ae 100644
--- a/src/Api/Mapper/CompactPayloadMapper.php
+++ b/src/Api/Mapper/CompactPayloadMapper.php
@@ -338,7 +338,7 @@ public function writeHttpResponse(HttpResponse $response, array $output)
         ];
 
         if ($response->getHeaders()) {
-            $output['cr']['r']['R']['h'] = $response->getHeaders();
+            $output['cr']['r']['R']['h'] = $response->getHeadersArray();
         }
 
         return $output;
diff --git a/src/Api/Mapper/ExtendedPayloadMapper.php b/src/Api/Mapper/ExtendedPayloadMapper.php
index 11b3429..a5ae5e0 100644
--- a/src/Api/Mapper/ExtendedPayloadMapper.php
+++ b/src/Api/Mapper/ExtendedPayloadMapper.php
@@ -347,7 +347,7 @@ public function writeHttpResponse(HttpResponse $response, array $output)
         ];
 
         if ($response->getHeaders()) {
-            $output['command_reply']['response']['response']['headers'] = $response->getHeaders();
+            $output['command_reply']['response']['response']['headers'] = $response->getHeadersArray();
         }
 
         return $output;
diff --git a/src/Api/Protocol/Http/HttpResponse.php b/src/Api/Protocol/Http/HttpResponse.php
index 0b34840..d955a17 100644
--- a/src/Api/Protocol/Http/HttpResponse.php
+++ b/src/Api/Protocol/Http/HttpResponse.php
@@ -210,6 +210,7 @@ public function getHeadersArray(): array
     public function setHeader($header, $value)
     {
         $this->headers[$header][] = $value;
+        $this->headerKeys[] = $header;
 
         return $this;
     }