overall: synced some MiniScript fixes into tdme2

andreasdr · Dec 13, 2023 · 892b09f · 892b09f
1 parent b268fce
commit 892b09f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/src/tdme/network/httpclient/HTTPClient.cpp b/src/tdme/network/httpclient/HTTPClient.cpp
@@ -227,7 +227,7 @@ void HTTPClient::execute() {
 		//
 		socket->shutdown();
 	} catch (Exception& exception) {
-		socket->shutdown();
+		if (socket != nullptr) socket->shutdown();
 		//
 		Console::println(string("HTTPClient::execute(): performed HTTP request: FAILED: ") + exception.what());
 		// rethrow

diff --git a/src/tdme/network/httpclient/HTTPDownloadClient.cpp b/src/tdme/network/httpclient/HTTPDownloadClient.cpp
@@ -318,7 +318,7 @@ void HTTPDownloadClient::start() {
 					downloadClient->finished = true;
 					downloadClient->progress = 1.0f;
 				} catch (Exception& exception) {
-					socket->shutdown();
+					if (socket != nullptr) socket->shutdown();
 					downloadClient->finished = true;
 					Console::println(string("HTTPDownloadClient::execute(): performed HTTP request: FAILED: ") + exception.what());
 				}

diff --git a/src/tdme/os/network/SecureTCPSocket.cpp b/src/tdme/os/network/SecureTCPSocket.cpp
@@ -7,8 +7,6 @@
 #include <openssl/rand.h>
 #include <openssl/ocsp.h>
 #include <openssl/bn.h>
-#include <openssl/trace.h>
-#include <openssl/async.h>
 #ifndef OPENSSL_NO_CT
 #include <openssl/ct.h>
 #endif

diff --git a/src/tdme/os/network/SecureTCPSocket.h b/src/tdme/os/network/SecureTCPSocket.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <openssl/types.h>
 #include <openssl/x509.h>
 
 #include <string>