summaryrefslogtreecommitdiff
path: root/indra/llmessage/llhttpclient.h
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-04-01 21:47:22 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-04-01 21:47:22 -0700
commitaa0a129b6798f8be554d1d9d41cbd217a0040daf (patch)
treea206cf638fa4a8f48dd869e0ccf12b7b6a428972 /indra/llmessage/llhttpclient.h
parent98695056c2fbfb91de805d9e2a01cde23668c4d3 (diff)
parent86dc5bce1a6fdde1238fea97ca1f6f8acb862184 (diff)
Automated Merge
Diffstat (limited to 'indra/llmessage/llhttpclient.h')
-rw-r--r--indra/llmessage/llhttpclient.h11
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