From 45061b0b14171cb02f985c94c8673dc299e9e16d Mon Sep 17 00:00:00 2001
From: Benjamin Sergeant <bsergean@gmail.com>
Date: Thu, 13 Feb 2020 12:25:18 -0800
Subject: [PATCH] (http client + sentry minidump upload) Multipart stream
 closing boundary is invalid + mark some options as mandatory in the command
 line toolsj

---
 docs/CHANGELOG.md                | 4 ++++
 ixwebsocket/IXHttpClient.cpp     | 2 +-
 ixwebsocket/IXWebSocketVersion.h | 2 +-
 ws/ws.cpp                        | 4 ++--
 ws/ws_sentry_minidump_upload.cpp | 1 -
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 46953b98..b02556a4 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 All changes to this project will be documented in this file.
 
+## [8.1.0] - 2020-02-13
+
+(http client + sentry minidump upload) Multipart stream closing boundary is invalid + mark some options as mandatory in the command line tools
+
 ## [8.0.7] - 2020-02-12
 
 (build) remove the unused subtree which was causing some way of installing to break
diff --git a/ixwebsocket/IXHttpClient.cpp b/ixwebsocket/IXHttpClient.cpp
index aa526720..b04c69d2 100644
--- a/ixwebsocket/IXHttpClient.cpp
+++ b/ixwebsocket/IXHttpClient.cpp
@@ -648,7 +648,7 @@ namespace ix
                << it.second << "\r\n";
         }
 
-        ss << "--" << multipartBoundary << "\r\n";
+        ss << "--" << multipartBoundary << "--\r\n";
 
         return ss.str();
     }
diff --git a/ixwebsocket/IXWebSocketVersion.h b/ixwebsocket/IXWebSocketVersion.h
index 594fbc7a..ab676371 100644
--- a/ixwebsocket/IXWebSocketVersion.h
+++ b/ixwebsocket/IXWebSocketVersion.h
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define IX_WEBSOCKET_VERSION "8.0.7"
+#define IX_WEBSOCKET_VERSION "8.1.0"
diff --git a/ws/ws.cpp b/ws/ws.cpp
index ae58b2d0..ccc0bcee 100644
--- a/ws/ws.cpp
+++ b/ws/ws.cpp
@@ -336,8 +336,8 @@ int main(int argc, char** argv)
     addTLSOptions(proxyServerApp);
 
     CLI::App* minidumpApp = app.add_subcommand("upload_minidump", "Upload a minidump to sentry");
-    minidumpApp->add_option("--minidump", minidump, "Minidump path")->check(CLI::ExistingPath);
-    minidumpApp->add_option("--metadata", metadata, "Hostname")->check(CLI::ExistingPath);
+    minidumpApp->add_option("--minidump", minidump, "Minidump path")->required()->check(CLI::ExistingPath);
+    minidumpApp->add_option("--metadata", metadata, "Metadata path")->required()->check(CLI::ExistingPath);
     minidumpApp->add_option("--project", project, "Sentry Project")->required();
     minidumpApp->add_option("--key", key, "Sentry Key")->required();
     minidumpApp->add_flag("-v", verbose, "Verbose");
diff --git a/ws/ws_sentry_minidump_upload.cpp b/ws/ws_sentry_minidump_upload.cpp
index 170a0f67..1c6e529b 100644
--- a/ws/ws_sentry_minidump_upload.cpp
+++ b/ws/ws_sentry_minidump_upload.cpp
@@ -48,7 +48,6 @@ namespace ix
         // Read json data
         std::string sentryMetadata = readBytes(metadataPath);
 
-
         std::atomic<bool> done(false);
 
         sentryClient.uploadMinidump(