From c22df88c362b6fc4ac8e5539613b9f850c30c97e Mon Sep 17 00:00:00 2001 From: rion Date: Fri, 2 Oct 2015 11:49:37 +0500 Subject: [PATCH 1/3] Uppercase CURL in find_package --- backends/twitter/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backends/twitter/CMakeLists.txt b/backends/twitter/CMakeLists.txt index 12ecb84a..68e4103f 100644 --- a/backends/twitter/CMakeLists.txt +++ b/backends/twitter/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories (${libtransport_SOURCE_DIR}/backends/twitter/libtwitcurl) FILE(GLOB SRC *.cpp libtwitcurl/*.cpp Requests/*.cpp) add_executable(spectrum2_twitter_backend ${SRC}) -find_package(curl) +find_package(CURL) if(CURL_FOUND) message(STATUS "Using curl ${CURL_VERSION_STRING}: ${CURL_INCLUDE_DIRS} ${CURL_LIBRARIES}") From 30d6dcb23cabb4ceadfc6342e39c70cec4b03dc7 Mon Sep 17 00:00:00 2001 From: rion Date: Sat, 3 Oct 2015 02:20:22 +0500 Subject: [PATCH 2/3] Pass TLSOptions to TLSConnectionFactory as requested by new API --- backends/libyahoo2/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backends/libyahoo2/main.cpp b/backends/libyahoo2/main.cpp index df88ab8b..a0214fae 100644 --- a/backends/libyahoo2/main.cpp +++ b/backends/libyahoo2/main.cpp @@ -107,7 +107,7 @@ class YahooPlugin : public NetworkPlugin { this->config = config; m_factories = new Swift::BoostNetworkFactories(loop); m_sslFactory = new Swift::OpenSSLContextFactory(); - m_tlsFactory = new Swift::TLSConnectionFactory(m_sslFactory, m_factories->getConnectionFactory()); + m_tlsFactory = new Swift::TLSConnectionFactory(m_sslFactory, m_factories->getConnectionFactory(), Swift::TLSOptions()); m_conn = m_factories->getConnectionFactory()->createConnection(); m_conn->onDataRead.connect(boost::bind(&YahooPlugin::_handleDataRead, this, _1)); m_conn->connect(Swift::HostAddressPort(Swift::HostAddress(host), port)); From ec73d7c0413d77f56ab9499771a94c409f2f769b Mon Sep 17 00:00:00 2001 From: Rion Date: Sat, 3 Oct 2015 14:29:48 +0500 Subject: [PATCH 3/3] Support old TLSConnectionFactory API as well --- backends/libyahoo2/main.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backends/libyahoo2/main.cpp b/backends/libyahoo2/main.cpp index a0214fae..eb5fbe5b 100644 --- a/backends/libyahoo2/main.cpp +++ b/backends/libyahoo2/main.cpp @@ -107,7 +107,11 @@ class YahooPlugin : public NetworkPlugin { this->config = config; m_factories = new Swift::BoostNetworkFactories(loop); m_sslFactory = new Swift::OpenSSLContextFactory(); +#if HAVE_SWIFTEN3 m_tlsFactory = new Swift::TLSConnectionFactory(m_sslFactory, m_factories->getConnectionFactory(), Swift::TLSOptions()); +#else + m_tlsFactory = new Swift::TLSConnectionFactory(m_sslFactory, m_factories->getConnectionFactory()); +#endif m_conn = m_factories->getConnectionFactory()->createConnection(); m_conn->onDataRead.connect(boost::bind(&YahooPlugin::_handleDataRead, this, _1)); m_conn->connect(Swift::HostAddressPort(Swift::HostAddress(host), port));