FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added calls to curl_global_init and curl_global_cleanup to improve the robustness of threaded curl plugin usage

Browse Source
This commit is contained in:
Robert Osfield 2019-07-18 10:34:53 +01:00
parent a8017cb807
commit 730e6ad8f5
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgPlugins/curl/ReaderWriterCURL.cpp
View File

@ -378,6 +378,9 @@ osgDB::ReaderWriter::ReadResult EasyCurl::processResponse(CURLcode res, const st
ReaderWriterCURL::ReaderWriterCURL()
{
// initialize curl to ensure it's done single threaded
curl_global_init(CURL_GLOBAL_ALL);
supportsProtocol("http","Read from http port using libcurl.");
supportsProtocol("https","Read from https port using libcurl.");
supportsProtocol("ftp","Read from ftp port using libcurl.");
@ -395,6 +398,11 @@ ReaderWriterCURL::ReaderWriterCURL()
ReaderWriterCURL::~ReaderWriterCURL()
{
//OSG_NOTICE<<"ReaderWriterCURL::~ReaderWriterCURL()"<<std::endl;
_threadCurlMap.clear();
// clean up curl
curl_global_cleanup();
}
osgDB::ReaderWriter::WriteResult ReaderWriterCURL::writeFile(const osg::Object& obj, osgDB::ReaderWriter* rw, std::ostream& fout, const osgDB::ReaderWriter::Options *options) const