Don't feed empty, non-working callback to CURL

Cherry-Pick of 96a4e16a

Conflicts:
	indra/llmessage/llurlrequest.cpp
	indra/llmessage/llurlrequest.h
	indra/newview/hipporestrequest.cpp

Clear reasons for conflicts, resolved.
This commit is contained in:
Siana Gearz
2012-08-07 16:48:22 +02:00
committed by Aleric Inglewood
parent 35a53ef1d7
commit 36ff4dcd11
5 changed files with 10 additions and 51 deletions

View File

@@ -142,7 +142,7 @@ public:
* Set whether request will check that remote server
* certificates are signed by a known root CA when using HTTPS.
*/
void setSSLVerifyCallback(SSLCertVerifyCallback callback, void * param);
void checkRootCertificate(bool check);
/**
@@ -227,8 +227,6 @@ protected:
S32 mRequestTransferedBytes;
S32 mResponseTransferedBytes;
static CURLcode _sslCtxCallback(CURL * curl, void *sslctx, void *param);
// mRemoved is used instead of changing mState directly, because I'm not convinced the latter is atomic.
// Set to false before adding curl request and then only tested.
// Reset in removed_from_multi_handle (by another thread), this is thread-safe.