X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_http.cc;h=ba028d6f002e2ef9b18b7851b59ca1723a7114b5;hb=244313f43fc3178fb8f58b01fc6ba125115062ad;hp=569c0e2197120a4b65864b13b12ab7cecd888e7c;hpb=004b57e9f67c6b818357759005c8e53b041dead4;p=ardour.git

diff --git a/gtk2_ardour/ardour_http.cc b/gtk2_ardour/ardour_http.cc
index 569c0e2197..ba028d6f00 100644
--- a/gtk2_ardour/ardour_http.cc
+++ b/gtk2_ardour/ardour_http.cc
@@ -105,6 +105,22 @@ WriteMemoryCallback (void *ptr, size_t size, size_t nmemb, void *data) {
 	return realsize;
 }
 
+static size_t headerCallback (char* ptr, size_t size, size_t nmemb, void* data)
+{
+	size_t realsize = size * nmemb;
+	struct HttpGet::HeaderInfo *nfo = (struct HttpGet::HeaderInfo*)data;
+	std::string header (static_cast<const char*>(ptr), realsize);
+	std::string::size_type index = header.find (':', 0);
+	if (index != std::string::npos) {
+		std::string k = header.substr (0, index);
+		std::string v = header.substr (index + 2);
+		k.erase(k.find_last_not_of (" \n\r\t")+1);
+		v.erase(v.find_last_not_of (" \n\r\t")+1);
+		nfo->h[k] = v;
+	}
+
+	return realsize;
+}
 
 HttpGet::HttpGet (bool p, bool ssl)
 	: persist (p)
@@ -116,6 +132,8 @@ HttpGet::HttpGet (bool p, bool ssl)
 
 	curl_easy_setopt (_curl, CURLOPT_WRITEDATA, (void *)&mem);
 	curl_easy_setopt (_curl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
+	curl_easy_setopt (_curl, CURLOPT_HEADERDATA, (void *)&nfo);
+	curl_easy_setopt (_curl, CURLOPT_HEADERFUNCTION, headerCallback);
 	curl_easy_setopt (_curl, CURLOPT_USERAGENT, PROGRAM_NAME VERSIONSTRING);
 	curl_easy_setopt (_curl, CURLOPT_TIMEOUT, ARDOUR_CURL_TIMEOUT);
 	curl_easy_setopt (_curl, CURLOPT_NOSIGNAL, 1);
@@ -141,7 +159,8 @@ HttpGet::~HttpGet ()
 char*
 HttpGet::get (const char* url)
 {
-	if (!_curl) {
+	_status = _result = -1;
+	if (!_curl || !url) {
 		return NULL;
 	}
 
@@ -151,7 +170,9 @@ HttpGet::get (const char* url)
 
 	if (!persist) {
 		free (mem.data);
-	}
+	} // otherwise caller is expected to have free()d or re-used it.
+
+	mem.data = NULL;
 	mem.size = 0;
 
 	curl_easy_setopt (_curl, CURLOPT_URL, url);