Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-12-19 17:17:51 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-12-19 17:17:51 (GMT) |
| commit | 775515df35bad313745efc26493399b63f43728c (patch) | |
| tree | da818fa3f8ba5b21dbde81fd2d26d4b501475503 | |
| parent | d67ecb18c1178ecf69e6cb5e8c8ee1fecee35e4c (diff) | |
| download | swift-contrib-775515df35bad313745efc26493399b63f43728c.zip swift-contrib-775515df35bad313745efc26493399b63f43728c.tar.bz2 | |
Disabling timer in BenchTool.
| -rw-r--r-- | Swiften/Examples/BenchTool/BenchTool.cpp | 8 | ||||
| -rw-r--r-- | Swiften/TLS/OpenSSL/OpenSSLContext.cpp | 5 |
2 files changed, 6 insertions, 7 deletions
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; } } |