Swiftdiff options
Diffstat (limited to 'Swiften/Network/BOSHConnectionPool.cpp')
| -rw-r--r-- | Swiften/Network/BOSHConnectionPool.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Network/BOSHConnectionPool.cpp b/Swiften/Network/BOSHConnectionPool.cpp index 56f7d12..c037b34 100644 --- a/Swiften/Network/BOSHConnectionPool.cpp +++ b/Swiften/Network/BOSHConnectionPool.cpp | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2011 Isode Limited. | 2 | * Copyright (c) 2011-2015 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -17,7 +17,7 @@ | |||
| 17 | #include <Swiften/Network/CachingDomainNameResolver.h> | 17 | #include <Swiften/Network/CachingDomainNameResolver.h> |
| 18 | 18 | ||
| 19 | namespace Swift { | 19 | namespace Swift { |
| 20 | BOSHConnectionPool::BOSHConnectionPool(const URL& boshURL, DomainNameResolver* realResolver, ConnectionFactory* connectionFactoryParameter, XMLParserFactory* parserFactory, TLSContextFactory* tlsFactory, TimerFactory* timerFactory, EventLoop* eventLoop, const std::string& to, unsigned long long initialRID, const URL& boshHTTPConnectProxyURL, const SafeString& boshHTTPConnectProxyAuthID, const SafeString& boshHTTPConnectProxyAuthPassword) : | 20 | BOSHConnectionPool::BOSHConnectionPool(const URL& boshURL, DomainNameResolver* realResolver, ConnectionFactory* connectionFactoryParameter, XMLParserFactory* parserFactory, TLSContextFactory* tlsFactory, TimerFactory* timerFactory, EventLoop* eventLoop, const std::string& to, unsigned long long initialRID, const URL& boshHTTPConnectProxyURL, const SafeString& boshHTTPConnectProxyAuthID, const SafeString& boshHTTPConnectProxyAuthPassword, const TLSOptions& tlsOptions) : |
| 21 | boshURL(boshURL), | 21 | boshURL(boshURL), |
| 22 | connectionFactory(connectionFactoryParameter), | 22 | connectionFactory(connectionFactoryParameter), |
| 23 | xmlParserFactory(parserFactory), | 23 | xmlParserFactory(parserFactory), |
| @@ -31,13 +31,13 @@ BOSHConnectionPool::BOSHConnectionPool(const URL& boshURL, DomainNameResolver* r | |||
| 31 | 31 | ||
| 32 | if (!boshHTTPConnectProxyURL.isEmpty()) { | 32 | if (!boshHTTPConnectProxyURL.isEmpty()) { |
| 33 | if (boshHTTPConnectProxyURL.getScheme() == "https") { | 33 | if (boshHTTPConnectProxyURL.getScheme() == "https") { |
| 34 | connectionFactory = new TLSConnectionFactory(tlsFactory, connectionFactory); | 34 | connectionFactory = new TLSConnectionFactory(tlsFactory, connectionFactory, tlsOptions); |
| 35 | myConnectionFactories.push_back(connectionFactory); | 35 | myConnectionFactories.push_back(connectionFactory); |
| 36 | } | 36 | } |
| 37 | connectionFactory = new HTTPConnectProxiedConnectionFactory(realResolver, connectionFactory, timerFactory, boshHTTPConnectProxyURL.getHost(), URL::getPortOrDefaultPort(boshHTTPConnectProxyURL), boshHTTPConnectProxyAuthID, boshHTTPConnectProxyAuthPassword); | 37 | connectionFactory = new HTTPConnectProxiedConnectionFactory(realResolver, connectionFactory, timerFactory, boshHTTPConnectProxyURL.getHost(), URL::getPortOrDefaultPort(boshHTTPConnectProxyURL), boshHTTPConnectProxyAuthID, boshHTTPConnectProxyAuthPassword); |
| 38 | } | 38 | } |
| 39 | if (boshURL.getScheme() == "https") { | 39 | if (boshURL.getScheme() == "https") { |
| 40 | connectionFactory = new TLSConnectionFactory(tlsFactory, connectionFactory); | 40 | connectionFactory = new TLSConnectionFactory(tlsFactory, connectionFactory, tlsOptions); |
| 41 | myConnectionFactories.push_back(connectionFactory); | 41 | myConnectionFactories.push_back(connectionFactory); |
| 42 | } | 42 | } |
| 43 | resolver = new CachingDomainNameResolver(realResolver, eventLoop); | 43 | resolver = new CachingDomainNameResolver(realResolver, eventLoop); |