6 files changed, 38 insertions, 10 deletions
diff --git a/core/io/compression.cpp b/core/io/compression.cpp
index 662411a62e..f806c4da6d 100644
--- a/core/io/compression.cpp
+++ b/core/io/compression.cpp
@@ -28,11 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "compression.h"
-
+#include "global_config.h"
 #include "os/copymem.h"
 #include "zip_io.h"
 
 #include "thirdparty/misc/fastlz.h"
+#include "thirdparty/zstd/zstd.h"
 
 #include <zlib.h>
 
@@ -57,7 +58,8 @@ int Compression::compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size,
 			strm.zalloc = zipio_alloc;
 			strm.zfree = zipio_free;
 			strm.opaque = Z_NULL;
-			int err = deflateInit(&strm, Z_DEFAULT_COMPRESSION);
+			int level = GLOBAL_GET("compression/zlib/compression_level");
+			int err = deflateInit(&strm, level);
 			if (err != Z_OK)
 				return -1;
 
@@ -76,6 +78,12 @@ int Compression::compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size,
 			return aout;
 
 		} break;
+		case MODE_ZSTD: {
+
+			int max_dst_size = get_max_compressed_buffer_size(p_src_size, MODE_ZSTD);
+			int level = GLOBAL_GET("compression/zstd/compression_level");
+			return ZSTD_compress(p_dst, max_dst_size, p_src, p_src_size, level);
+		} break;
 	}
 
 	ERR_FAIL_V(-1);
@@ -105,6 +113,10 @@ int Compression::get_max_compressed_buffer_size(int p_src_size, Mode p_mode) {
 			deflateEnd(&strm);
 			return aout;
 		} break;
+		case MODE_ZSTD: {
+
+			return ZSTD_compressBound(p_src_size);
+		} break;
 	}
 
 	ERR_FAIL_V(-1);
@@ -148,6 +160,10 @@ int Compression::decompress(uint8_t *p_dst, int p_dst_max_size, const uint8_t *p
 			ERR_FAIL_COND_V(err != Z_STREAM_END, -1);
 			return total;
 		} break;
+		case MODE_ZSTD: {
+
+			return ZSTD_decompress(p_dst, p_dst_max_size, p_src, p_src_size);
+		} break;
 	}
 
 	ERR_FAIL_V(-1);
diff --git a/core/io/compression.h b/core/io/compression.h
index a982a074b1..742f0f4d68 100644
--- a/core/io/compression.h
+++ b/core/io/compression.h
@@ -36,12 +36,13 @@ class Compression {
 public:
 	enum Mode {
 		MODE_FASTLZ,
-		MODE_DEFLATE
+		MODE_DEFLATE,
+		MODE_ZSTD
 	};
 
-	static int compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size, Mode p_mode = MODE_FASTLZ);
-	static int get_max_compressed_buffer_size(int p_src_size, Mode p_mode = MODE_FASTLZ);
-	static int decompress(uint8_t *p_dst, int p_dst_max_size, const uint8_t *p_src, int p_src_size, Mode p_mode = MODE_FASTLZ);
+	static int compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size, Mode p_mode = MODE_ZSTD);
+	static int get_max_compressed_buffer_size(int p_src_size, Mode p_mode = MODE_ZSTD);
+	static int decompress(uint8_t *p_dst, int p_dst_max_size, const uint8_t *p_src, int p_src_size, Mode p_mode = MODE_ZSTD);
 
 	Compression();
 };
diff --git a/core/io/file_access_compressed.cpp b/core/io/file_access_compressed.cpp
index 4c6e8f5507..4e802579c6 100644
--- a/core/io/file_access_compressed.cpp
+++ b/core/io/file_access_compressed.cpp
@@ -369,7 +369,7 @@ FileAccessCompressed::FileAccessCompressed() {
 	f = NULL;
 	magic = "GCMP";
 	block_size = 16384;
-	cmode = Compression::MODE_DEFLATE;
+	cmode = Compression::MODE_ZSTD;
 	writing = false;
 	write_ptr = 0;
 	write_buffer_size = 0;
diff --git a/core/io/file_access_compressed.h b/core/io/file_access_compressed.h
index 6af9d9b6ca..340c298a0f 100644
--- a/core/io/file_access_compressed.h
+++ b/core/io/file_access_compressed.h
@@ -64,7 +64,7 @@ class FileAccessCompressed : public FileAccess {
 	FileAccess *f;
 
 public:
-	void configure(const String &p_magic, Compression::Mode p_mode = Compression::MODE_FASTLZ, int p_block_size = 4096);
+	void configure(const String &p_magic, Compression::Mode p_mode = Compression::MODE_ZSTD, int p_block_size = 4096);
 
 	Error open_after_magic(FileAccess *p_base);
 
diff --git a/core/io/http_client.cpp b/core/io/http_client.cpp
index 899f3b3b2d..0c84a5213f 100644
--- a/core/io/http_client.cpp
+++ b/core/io/http_client.cpp
@@ -96,7 +96,12 @@ Error HTTPClient::request_raw(Method p_method, const String &p_url, const Vector
 	};
 
 	String request = String(_methods[p_method]) + " " + p_url + " HTTP/1.1\r\n";
-	request += "Host: " + conn_host + ":" + itos(conn_port) + "\r\n";
+	if ((ssl && conn_port == 443) || (!ssl && conn_port == 80)) {
+		// don't append the standard ports
+		request += "Host: " + conn_host + "\r\n";
+	} else {
+		request += "Host: " + conn_host + ":" + itos(conn_port) + "\r\n";
+	}
 	bool add_clen = p_body.size() > 0;
 	for (int i = 0; i < p_headers.size(); i++) {
 		request += p_headers[i] + "\r\n";
@@ -151,7 +156,12 @@ Error HTTPClient::request(Method p_method, const String &p_url, const Vector<Str
 	};
 
 	String request = String(_methods[p_method]) + " " + p_url + " HTTP/1.1\r\n";
-	request += "Host: " + conn_host + ":" + itos(conn_port) + "\r\n";
+	if ((ssl && conn_port == 443) || (!ssl && conn_port == 80)) {
+		// don't append the standard ports
+		request += "Host: " + conn_host + "\r\n";
+	} else {
+		request += "Host: " + conn_host + ":" + itos(conn_port) + "\r\n";
+	}
 	bool add_clen = p_body.length() > 0;
 	for (int i = 0; i < p_headers.size(); i++) {
 		request += p_headers[i] + "\r\n";
diff --git a/core/io/resource_import.h b/core/io/resource_import.h
index 25b7a534b2..9d2a5180dc 100644
--- a/core/io/resource_import.h
+++ b/core/io/resource_import.h
@@ -61,6 +61,7 @@ public:
 	String get_internal_resource_path(const String &p_path) const;
 
 	void add_importer(const Ref<ResourceImporter> &p_importer) { importers.insert(p_importer); }
+	void remove_importer(const Ref<ResourceImporter> &p_importer) { importers.erase(p_importer); }
 	Ref<ResourceImporter> get_importer_by_name(const String &p_name);
 	Ref<ResourceImporter> get_importer_by_extension(const String &p_extension);
 	void get_importers_for_extension(const String &p_extension, List<Ref<ResourceImporter> > *r_importers);