diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-27 21:22:46 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-27 21:22:46 -0700 |
| commit | e44d0254af990b659a281cf0020cd06a3931bd77 (patch) | |
| tree | 6091f92ed222d82be55117a3d968b47482fbb944 /indra/newview/llxmlrpctransaction.cpp | |
| parent | 776fea3764bd1a14a712dcfe22f2b254b188f0a6 (diff) | |
| parent | cf05f59dd923d623bc50135214a488a29664ab95 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llxmlrpctransaction.cpp')
| -rw-r--r-- | indra/newview/llxmlrpctransaction.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp index bc7f8ec854..e1572e3e3b 100644 --- a/indra/newview/llxmlrpctransaction.cpp +++ b/indra/newview/llxmlrpctransaction.cpp @@ -248,7 +248,8 @@ int LLXMLRPCTransaction::Impl::_sslCertVerifyCallback(X509_STORE_CTX *ctx, void validation_params[CERT_HOSTNAME] = uri.hostName(); try { - chain->validate(VALIDATION_POLICY_SSL, store, validation_params); + // don't validate hostname. Let libcurl do it instead. That way, it'll handle redirects + store->validate(VALIDATION_POLICY_SSL & (~VALIDATION_POLICY_HOSTNAME), chain, validation_params); } catch (LLCertValidationTrustException& cert_exception) { |