diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-07 18:39:29 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-07 18:39:29 +0300 |
| commit | bb2a0adecaee2f7464caff602473d75c6b65bcaa (patch) | |
| tree | 6da7bc3cf29b8f5f6dd7b08f9beee007b6408f02 /indra/llmessage/llhttpclient.h | |
| parent | 7ba7bc6c3733420bd4d73a180627a81640a5b265 (diff) | |
| parent | adce2ecdf8f3a0efcd4907699d286012124ac496 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llmessage/llhttpclient.h')
| -rw-r--r-- | indra/llmessage/llhttpclient.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/llmessage/llhttpclient.h b/indra/llmessage/llhttpclient.h index 8afbc9e0fc..3d0646e5fe 100644 --- a/indra/llmessage/llhttpclient.h +++ b/indra/llmessage/llhttpclient.h @@ -40,8 +40,7 @@ #include <string> #include <boost/intrusive_ptr.hpp> -#include <openssl/x509_vfy.h> -#include "llurlrequest.h" + #include "llassettype.h" #include "llcurl.h" #include "lliopipe.h" @@ -62,7 +61,6 @@ public: typedef LLCurl::Responder Responder; typedef LLCurl::ResponderPtr ResponderPtr; - /** @name non-blocking API */ //@{ static void head( @@ -157,12 +155,7 @@ public: static void setPump(LLPumpIO& pump); ///< must be called before any of the above calls are made static bool hasPump(); - - static void setCertVerifyCallback(LLURLRequest::SSLCertVerifyCallback callback); - static LLURLRequest::SSLCertVerifyCallback getCertVerifyCallback() { return mCertVerifyCallback; } - -protected: - static LLURLRequest::SSLCertVerifyCallback mCertVerifyCallback; + ///< for testing }; #endif // LL_LLHTTPCLIENT_H |