diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-04-22 15:10:36 -0700 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-22 15:10:36 -0700 |
commit | cdc42c49b24415448baf32e4ef40f56ffe697bb3 (patch) | |
tree | 8bbfa5f51ea70d1b48015efa75b57803d9b40d05 /indra/llmessage/llhttpclient.h | |
parent | 6837f660380d1d5ddff021e6c14273937ff11036 (diff) | |
parent | 5e727964dbd6d5e55dd3a0921e8e1f0f77a99747 (diff) |
automated merge
Diffstat (limited to 'indra/llmessage/llhttpclient.h')
-rw-r--r-- | indra/llmessage/llhttpclient.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/llmessage/llhttpclient.h b/indra/llmessage/llhttpclient.h index 3d0646e5fe..8afbc9e0fc 100644 --- a/indra/llmessage/llhttpclient.h +++ b/indra/llmessage/llhttpclient.h @@ -40,7 +40,8 @@ #include <string> #include <boost/intrusive_ptr.hpp> - +#include <openssl/x509_vfy.h> +#include "llurlrequest.h" #include "llassettype.h" #include "llcurl.h" #include "lliopipe.h" @@ -61,6 +62,7 @@ public: typedef LLCurl::Responder Responder; typedef LLCurl::ResponderPtr ResponderPtr; + /** @name non-blocking API */ //@{ static void head( @@ -155,7 +157,12 @@ public: static void setPump(LLPumpIO& pump); ///< must be called before any of the above calls are made static bool hasPump(); - ///< for testing + + static void setCertVerifyCallback(LLURLRequest::SSLCertVerifyCallback callback); + static LLURLRequest::SSLCertVerifyCallback getCertVerifyCallback() { return mCertVerifyCallback; } + +protected: + static LLURLRequest::SSLCertVerifyCallback mCertVerifyCallback; }; #endif // LL_LLHTTPCLIENT_H |