diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2016-06-19 13:27:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-19 13:27:52 +0200 |
| commit | d5fbc14ecf4af68cc2759009e8f5f719c2dec75a (patch) | |
| tree | 05b1ad7cedb864281dcb39966c5b70a9870d4bd6 /Source/Core/Common/Analytics.cpp | |
| parent | a50ac27064b573ad72544d65a188ab34e9beca1a (diff) | |
| parent | b8496fc844f75f9479c53cc3420acd6818e27fd3 (diff) | |
Merge pull request #3907 from delroth/analytics-alpn
analytics: Disable ALPN only on Windows.
Diffstat (limited to 'Source/Core/Common/Analytics.cpp')
| -rw-r--r-- | Source/Core/Common/Analytics.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/Core/Common/Analytics.cpp b/Source/Core/Common/Analytics.cpp index 324748936d..29359cc815 100644 --- a/Source/Core/Common/Analytics.cpp +++ b/Source/Core/Common/Analytics.cpp @@ -203,8 +203,10 @@ HttpAnalyticsBackend::HttpAnalyticsBackend(const std::string& endpoint) curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &DummyCurlWriteFunction); curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, 3000); +#ifdef _WIN32 // ALPN support is enabled by default but requires Windows >= 8.1. curl_easy_setopt(curl, CURLOPT_SSL_ENABLE_ALPN, false); +#endif m_curl = curl; } |