Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/hipporestrequest.cpp
View File

@@ -268,7 +268,7 @@ static void request(const std::string &url,
llwarns << "Failed to create LLURLRequest: " << error.what() << llendl;
return;
}
req->setSSLVerifyCallback(LLHTTPClient::getCertVerifyCallback(), (void *)req);
req->checkRootCertificate(true);
/*
// Insert custom headers if the caller sent any