From 1b3428764ec07e71eac9b8a3e520871e9e5d3f6f Mon Sep 17 00:00:00 2001
From: Samuel Santos <sanmoo.cs@gmail.com>
Date: Tue, 19 Dec 2017 15:09:57 -0200
Subject: [PATCH] Update webclient management of cookies

The 'request' method was overriding provided 'Cookies' header if
previous requests had captured other cookies.

Change-Id: I51e24e6095fa5955504b767a77fa5f2fb85448f7
---
 pyghmi/util/webclient.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pyghmi/util/webclient.py b/pyghmi/util/webclient.py
index 36c215ad..5de6798d 100644
--- a/pyghmi/util/webclient.py
+++ b/pyghmi/util/webclient.py
@@ -168,7 +168,11 @@ class SecureHTTPConnection(httplib.HTTPConnection, object):
             cookies = []
             for ckey in self.cookies:
                 cookies.append('{0}={1}'.format(ckey, self.cookies[ckey]))
-            headers['Cookie'] = '; '.join(cookies)
+            cookies_header = '; '.join(cookies)
+            if headers['Cookie'] is None:
+                headers['Cookie'] = cookies_header
+            else:
+                headers['Cookie'] += '; ' + '; '.join(cookies)
         if referer:
             headers['Referer'] = referer
         return super(SecureHTTPConnection, self).request(method, url, body,