diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-11-11 22:16:04 +0200 |
---|---|---|
committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-11-11 22:16:04 +0200 |
commit | 74c3b7a0ee70f639dc5dcfd08f7f0762758183ee (patch) | |
tree | dffe098f8ff7443eaa20a215c980a395252dc190 /indra/llcorehttp | |
parent | 3f51c0423942f61d27c33bfdb1622e5ae2b8c9ae (diff) | |
parent | 04c473ab46041133ea6a87dbe0d43e662472adf5 (diff) |
Merged master (DRTVWR-507) into DRTVWR-514-keymappings
Diffstat (limited to 'indra/llcorehttp')
-rw-r--r-- | indra/llcorehttp/_httpoprequest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp index 408adbde2b..7bea8e9f9c 100644 --- a/indra/llcorehttp/_httpoprequest.cpp +++ b/indra/llcorehttp/_httpoprequest.cpp @@ -1017,8 +1017,8 @@ CURLcode HttpOpRequest::curlSslCtxCallback(CURL *curl, void *sslctx, void *userd } else { - // disable any default verification for server certs
- // Ex: setting urls (assume non-SL) for parcel media in LLFloaterURLEntry
+ // disable any default verification for server certs + // Ex: setting urls (assume non-SL) for parcel media in LLFloaterURLEntry SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, NULL); } // set the verification callback. |