From 775515df35bad313745efc26493399b63f43728c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sun, 19 Dec 2010 18:17:51 +0100
Subject: Disabling timer in BenchTool.


diff --git a/Swiften/Examples/BenchTool/BenchTool.cpp b/Swiften/Examples/BenchTool/BenchTool.cpp
index 1dcc8c2..9b6f1ae 100644
--- a/Swiften/Examples/BenchTool/BenchTool.cpp
+++ b/Swiften/Examples/BenchTool/BenchTool.cpp
@@ -55,13 +55,7 @@ int main(int, char**) {
 		clients[i]->connect();
 	}
 
-	{
-		Timer::ref timer = networkFactories.getTimerFactory()->createTimer(30000);
-		timer->onTick.connect(boost::bind(&SimpleEventLoop::stop, &eventLoop));
-		timer->start();
-
-		eventLoop.run();
-	}
+	eventLoop.run();
 
 	for (size_t i = 0; i < clients.size(); ++i) {
 		delete clients[i];
diff --git a/Swiften/TLS/OpenSSL/OpenSSLContext.cpp b/Swiften/TLS/OpenSSL/OpenSSLContext.cpp
index 30a2b11..e922f2d 100644
--- a/Swiften/TLS/OpenSSL/OpenSSLContext.cpp
+++ b/Swiften/TLS/OpenSSL/OpenSSLContext.cpp
@@ -68,6 +68,11 @@ void OpenSSLContext::ensureLibraryInitialized() {
 		SSL_load_error_strings();
 		SSL_library_init();
 		OpenSSL_add_all_algorithms();
+
+		// Disable compression
+		/*STACK_OF(SSL_COMP)* compressionMethods = SSL_COMP_get_compression_methods();
+		sk_SSL_COMP_zero(compressionMethods);*/
+
 		isLibraryInitialized = true;
 	}
 }
-- 
cgit v0.10.2-6-g49f6