mirror of
https://github.com/obsproject/obs-studio.git
synced 2026-09-24 23:31:36 +08:00
UI, file-updater, rtmp-services: Enable curl ALPN support
In the years since this code was added, ALPN is now widely supported, and NPN is being removed entirely in the latest version of nginx. It's time to start using ALPN!
This commit is contained in:
@@ -77,11 +77,6 @@ void RemoteTextThread::run()
|
||||
curl_easy_setopt(curl.get(), CURLOPT_TIMEOUT,
|
||||
timeoutSec);
|
||||
|
||||
#if LIBCURL_VERSION_NUM >= 0x072400
|
||||
// A lot of servers don't yet support ALPN
|
||||
curl_easy_setopt(curl.get(), CURLOPT_SSL_ENABLE_ALPN, 0);
|
||||
#endif
|
||||
|
||||
if (!postData.empty()) {
|
||||
curl_easy_setopt(curl.get(), CURLOPT_POSTFIELDS,
|
||||
postData.c_str());
|
||||
@@ -177,10 +172,6 @@ bool GetRemoteFile(const char *url, std::string &str, std::string &error,
|
||||
curl_easy_setopt(curl.get(), CURLOPT_TIMEOUT,
|
||||
timeoutSec);
|
||||
|
||||
#if LIBCURL_VERSION_NUM >= 0x072400
|
||||
// A lot of servers don't yet support ALPN
|
||||
curl_easy_setopt(curl.get(), CURLOPT_SSL_ENABLE_ALPN, 0);
|
||||
#endif
|
||||
if (!request_type.empty()) {
|
||||
if (request_type != "GET")
|
||||
curl_easy_setopt(curl.get(),
|
||||
|
||||
Reference in New Issue
Block a user