diff options
author | Ilnaz Nizametdinov <i.nizametdinov@gmail.com> | 2022-02-10 16:48:01 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:48:01 +0300 |
commit | 17644d1207cae94abb87ae27d63dbf40e477cda4 (patch) | |
tree | b222e5ac2e2e98872661c51ccceee5da0d291e13 /contrib | |
parent | 86c3bbf7131fc3929bdb31e29fdf016038d68594 (diff) | |
download | ydb-17644d1207cae94abb87ae27d63dbf40e477cda4.tar.gz |
Restoring authorship annotation for Ilnaz Nizametdinov <i.nizametdinov@gmail.com>. Commit 2 of 2.
Diffstat (limited to 'contrib')
4 files changed, 26 insertions, 26 deletions
diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/include/aws/core/client/ClientConfiguration.h b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/include/aws/core/client/ClientConfiguration.h index 7b75018619..ba54baaa83 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/include/aws/core/client/ClientConfiguration.h +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/include/aws/core/client/ClientConfiguration.h @@ -180,22 +180,22 @@ namespace Aws */ Aws::String caPath; /** - * Same as caPath, but useful if you have users going through a proxy. - * Used to set CURLOPT_PROXY_CAPATH in libcurl. - */ - Aws::String proxyCaPath; - /** + * Same as caPath, but useful if you have users going through a proxy. + * Used to set CURLOPT_PROXY_CAPATH in libcurl. + */ + Aws::String proxyCaPath; + /** * If you certificate file is different from the default, you can tell clients that * aren't using the default trust store where to find your ca file. * If you are on windows or apple, you likely don't want this. */ Aws::String caFile; /** - * Same as caFile, but useful if you have users going through a proxy. - * Used to set CURLOPT_PROXY_CAINFO in libcurl. - */ - Aws::String proxyCaFile; - /** + * Same as caFile, but useful if you have users going through a proxy. + * Used to set CURLOPT_PROXY_CAINFO in libcurl. + */ + Aws::String proxyCaFile; + /** * Rate Limiter implementation for outgoing bandwidth. Default is wide-open. */ std::shared_ptr<Aws::Utils::RateLimits::RateLimiterInterface> writeRateLimiter; diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/include/aws/core/http/curl/CurlHttpClient.h b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/include/aws/core/http/curl/CurlHttpClient.h index c3051b8152..31f96befd5 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/include/aws/core/http/curl/CurlHttpClient.h +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/include/aws/core/http/curl/CurlHttpClient.h @@ -63,8 +63,8 @@ private: bool m_verifySSL; Aws::String m_caPath; Aws::String m_caFile; - Aws::String m_proxyCaPath; - Aws::String m_proxyCaFile; + Aws::String m_proxyCaPath; + Aws::String m_proxyCaFile; bool m_disableExpectHeader; bool m_allowRedirects; static std::atomic<bool> isInit; diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/include/aws/core/utils/Outcome.h b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/include/aws/core/utils/Outcome.h index 6683e3d860..70e9e4be26 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/include/aws/core/utils/Outcome.h +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/include/aws/core/utils/Outcome.h @@ -26,19 +26,19 @@ namespace Aws { public: - Outcome() : result(), error(), success(false) + Outcome() : result(), error(), success(false) { } - Outcome(const R& r) : result(r), error(), success(true) + Outcome(const R& r) : result(r), error(), success(true) { } - Outcome(const E& e) : result(), error(e), success(false) + Outcome(const E& e) : result(), error(e), success(false) { } - Outcome(R&& r) : result(std::forward<R>(r)), error(), success(true) + Outcome(R&& r) : result(std::forward<R>(r)), error(), success(true) { } - Outcome(E&& e) : result(), error(std::forward<E>(e)), success(false) + Outcome(E&& e) : result(), error(std::forward<E>(e)), success(false) { } Outcome(const Outcome& o) : diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/source/http/curl/CurlHttpClient.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/source/http/curl/CurlHttpClient.cpp index 3db94925b8..2fb9cc9643 100644 --- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/source/http/curl/CurlHttpClient.cpp +++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/source/http/curl/CurlHttpClient.cpp @@ -444,7 +444,7 @@ CurlHttpClient::CurlHttpClient(const ClientConfiguration& clientConfig) : m_proxySSLKeyPath(clientConfig.proxySSLKeyPath), m_proxySSLKeyType(clientConfig.proxySSLKeyType), m_proxyKeyPasswd(clientConfig.proxySSLKeyPassword), m_proxyPort(clientConfig.proxyPort), m_verifySSL(clientConfig.verifySSL), m_caPath(clientConfig.caPath), - m_caFile(clientConfig.caFile), m_proxyCaPath(clientConfig.proxyCaPath), m_proxyCaFile(clientConfig.proxyCaFile), + m_caFile(clientConfig.caFile), m_proxyCaPath(clientConfig.proxyCaPath), m_proxyCaFile(clientConfig.proxyCaFile), m_disableExpectHeader(clientConfig.disableExpectHeader) { if (clientConfig.followRedirects == FollowRedirectsPolicy::NEVER || @@ -582,14 +582,14 @@ std::shared_ptr<HttpResponse> CurlHttpClient::MakeRequest(const std::shared_ptr< ss << m_proxyScheme << "://" << m_proxyHost; curl_easy_setopt(connectionHandle, CURLOPT_PROXY, ss.str().c_str()); curl_easy_setopt(connectionHandle, CURLOPT_PROXYPORT, (long) m_proxyPort); - if(!m_proxyCaPath.empty()) - { - curl_easy_setopt(connectionHandle, CURLOPT_PROXY_CAPATH, m_proxyCaPath.c_str()); - } - if(!m_proxyCaFile.empty()) - { - curl_easy_setopt(connectionHandle, CURLOPT_PROXY_CAINFO, m_proxyCaFile.c_str()); - } + if(!m_proxyCaPath.empty()) + { + curl_easy_setopt(connectionHandle, CURLOPT_PROXY_CAPATH, m_proxyCaPath.c_str()); + } + if(!m_proxyCaFile.empty()) + { + curl_easy_setopt(connectionHandle, CURLOPT_PROXY_CAINFO, m_proxyCaFile.c_str()); + } if (!m_proxyUserName.empty() || !m_proxyPassword.empty()) { curl_easy_setopt(connectionHandle, CURLOPT_PROXYUSERNAME, m_proxyUserName.c_str()); |