From d0cf9617a54a49ecf819076555cce931a0f71683 Mon Sep 17 00:00:00 2001
From: Dag Wieers <dag@wieers.com>
Date: Fri, 19 Jun 2015 13:30:29 +0200
Subject: [PATCH] Spurious newline could corrupt payload

Due to a spurious newline we corrupted the payload. It depends on the order of the headers and if there were headers added by vSphere.

The Accept header was also not needed.
---
 cloud/vmware/vsphere_copy | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cloud/vmware/vsphere_copy b/cloud/vmware/vsphere_copy
index f85beab481d..0ca9780c008 100644
--- a/cloud/vmware/vsphere_copy
+++ b/cloud/vmware/vsphere_copy
@@ -120,11 +120,10 @@ def main():
     atexit.register(conn.close)
 
     remote_path = vmware_path(datastore, datacenter, dest)
-    auth = base64.encodestring('%s:%s' % (login, password))
+    auth = base64.encodestring('%s:%s' % (login, password)).rstrip()
     headers = {
         "Content-Type": "application/octet-stream",
         "Content-Length": str(len(data)),
-        "Accept": "text/plain",
         "Authorization": "Basic %s" % auth,
     }