diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-07-19 21:52:37 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-07-19 21:52:37 +0000 |
| commit | 08f04113c9252258c9cb6132efa327432c3c27e0 (patch) | |
| tree | 5ec6c6d42eaca354f58e21b926d9108e43367484 /indra/llcorehttp/httpoptions.cpp | |
| parent | 10f84d8244d01728338f1eb20b0b25271fc7db63 (diff) | |
| parent | aa322d8eb4341c213a19cef87a887114c1ca278b (diff) | |
Merged in DV541-merge-6.4.22 (pull request #629)
DRTVWR-541 merge up to v 6.4.22
Diffstat (limited to 'indra/llcorehttp/httpoptions.cpp')
| -rw-r--r-- | indra/llcorehttp/httpoptions.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/llcorehttp/httpoptions.cpp b/indra/llcorehttp/httpoptions.cpp index df5aa52fa9..c6365e5091 100644 --- a/indra/llcorehttp/httpoptions.cpp +++ b/indra/llcorehttp/httpoptions.cpp @@ -32,6 +32,7 @@ namespace LLCore { + bool HttpOptions::sDefaultVerifyPeer = false; HttpOptions::HttpOptions() : mWantHeaders(false), @@ -43,7 +44,7 @@ HttpOptions::HttpOptions() : mMaxRetryBackoff(HTTP_RETRY_BACKOFF_MAX_DEFAULT), mUseRetryAfter(HTTP_USE_RETRY_AFTER_DEFAULT), mFollowRedirects(true), - mVerifyPeer(false), + mVerifyPeer(sDefaultVerifyPeer), mVerifyHost(false), mDNSCacheTimeout(-1L), mNoBody(false) @@ -122,7 +123,15 @@ void HttpOptions::setHeadersOnly(bool nobody) { mNoBody = nobody; if (mNoBody) + { setWantHeaders(true); + setSSLVerifyPeer(false); + } +} + +void HttpOptions::setDefaultSSLVerifyPeer(bool verify) +{ + sDefaultVerifyPeer = verify; } } // end namespace LLCore |