Libtransport: Fix memory leaks in tests, fix HTTPRequest memory leak in CURL code

2 files changed, 13 insertions, 0 deletions

diff --git a/include/Swiften/Network/DummyNetworkFactories.cpp b/include/Swiften/Network/DummyNetworkFactories.cpp
index a47ec8fe..cbd258cc 100644
--- a/include/Swiften/Network/DummyNetworkFactories.cpp
+++ b/include/Swiften/Network/DummyNetworkFactories.cpp
@@ -40,6 +40,11 @@ DummyNetworkFactories::~DummyNetworkFactories() {
 	delete connectionFactory;
 	delete timerFactory;
 	delete m_platformXMLParserFactory;
+
+#if HAVE_SWIFTEN_3
+	delete cryptoProvider;
+	delete networkEnvironment;
+#endif
 }
 
 }
diff --git a/include/transport/HTTPRequest.h b/include/transport/HTTPRequest.h
index d1b780e8..5eea4151 100644
--- a/include/transport/HTTPRequest.h
+++ b/include/transport/HTTPRequest.h
@@ -40,6 +40,14 @@ class HTTPRequest : public Thread {
 
 		boost::signal<void ()> onRequestFinished;
 
+		static void globalInit() {
+			curl_global_init(CURL_GLOBAL_ALL);
+		}
+
+		static void globalCleanup() {
+			curl_global_cleanup();
+		}
+
 	private:
 		bool init();
 		bool GET(std::string url, std::string &output);