From 730e6ad8f5e2dba90e398e8bee115824b28f8269 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 18 Jul 2019 10:34:53 +0100
Subject: [PATCH] Added calls to curl_global_init and curl_global_cleanup to
 improve the robustness of threaded curl plugin usage

---
 src/osgPlugins/curl/ReaderWriterCURL.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/osgPlugins/curl/ReaderWriterCURL.cpp b/src/osgPlugins/curl/ReaderWriterCURL.cpp
index 1aa36166f..628da025a 100644
--- a/src/osgPlugins/curl/ReaderWriterCURL.cpp
+++ b/src/osgPlugins/curl/ReaderWriterCURL.cpp
@@ -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