Merge branch 'staging' into sdk-655

Author: ArtursKadikis

CHANGELOG.md

@@ -1,8 +1,10 @@
 21.11.1
+* !! Major breaking change !! Fixed a bug that triggered when providing segmentation to the "RecordEvent" call. Previously, by mistake, every segmentation value was parsed as a JSON and threw an exception when it wasn't a valid JSON string. Now this will not be the case and every String value can be provided. This is marked as a "major breaking change" in case some integrations were adding workarounds to this issue.
 * ! Minor breaking change ! Default automatic session update duration changed to 60 seconds.
 * Added a call to change the automatic session update duration.
 * Fixed a bug where session duration was reported wrong.
 * Fixed a bug that was a typo ('COUNTLY_CUSTOM_HTTP' instead of 'COUNTLY_USE_CUSTOM_HTTP') in the cmake file that cause the SDK to be misconfigured. 
+* Fixed a bug that caused POST requests to fail on Windows.
 
 21.11.0
 * Fixed session duration issue.

include/countly.hpp

@@ -182,7 +182,7 @@ class Countly {
 		Event event(key, count);
 
 		for (auto key_value: segmentation) {
-			event.addSegmentation(key_value.first, json::parse(key_value.second));
+			event.addSegmentation(key_value.first, key_value.second);
 		}
 
 		addEvent(event);
@@ -192,7 +192,7 @@ class Countly {
 		Event event(key, count, sum);
 
 		for (auto key_value: segmentation) {
-			event.addSegmentation(key_value.first, json::parse(key_value.second));
+			event.addSegmentation(key_value.first, key_value.second);
 		}
 
 		addEvent(event);
@@ -202,7 +202,7 @@ class Countly {
 		Event event(key, count, sum, duration);
 
 		for (auto key_value: segmentation) {
-			event.addSegmentation(key_value.first, json::parse(key_value.second));
+			event.addSegmentation(key_value.first, key_value.second);
 		}
 
 		addEvent(event);

src/countly.cpp

@@ -242,6 +242,7 @@ void Countly::stop() {
 			log(Countly::LogLevel::WARNING, "Could not join thread");
 		}
 		delete thread;
+		thread = nullptr;
 	}
 	if (began_session) {
 		endSession();
@@ -655,20 +656,21 @@ log(Countly::LogLevel::DEBUG, "[Countly][sendHTTP] data: "+ data);
 		data += "checksum256=";
 		data += checksum_stream.str();
 	}
+
+	Countly::HTTPResponse response;
+	response.success = false;
+
 #ifdef COUNTLY_USE_CUSTOM_HTTP
 	if (http_client_function == nullptr) {
 		log(Countly::LogLevel::FATAL, "Missing HTTP client function");
-		return false;
+		return response;
 	}
 
 	return http_client_function(use_post, path, data);
 #else
 	if (http_client_function != nullptr) {
 		return http_client_function(use_post, path, data);
 	}
-
-	Countly::HTTPResponse response;
-	response.success = false;
 #ifdef _WIN32
 	HINTERNET hSession;
 	HINTERNET hConnect;
@@ -701,7 +703,8 @@ log(Countly::LogLevel::DEBUG, "[Countly][sendHTTP] data: "+ data);
 	}
 
 	if (hRequest) {
-		bool ok = WinHttpSendRequest(hRequest, WINHTTP_NO_ADDITIONAL_HEADERS, 0, use_post ? (LPVOID)data.data() : WINHTTP_NO_REQUEST_DATA, use_post ? data.size() : 0, 0, 0) != 0;
+		LPCWSTR headers = use_post ? L"content-type:application/x-www-form-urlencoded" : WINHTTP_NO_ADDITIONAL_HEADERS;
+		bool ok = WinHttpSendRequest(hRequest, headers, 0, use_post ? (LPVOID)data.data() : WINHTTP_NO_REQUEST_DATA, use_post ? data.size() : 0, use_post ? data.size() : 0, 0) != 0;
 		if (ok) {
 			ok = WinHttpReceiveResponse(hRequest, NULL);
 			if (ok) {