Merge from develop

ChangeLog.txt

@@ -7,6 +7,11 @@ New Features:
 Improvements:
 * Performance improvements
 
+Version 0.9.6 (unreleased)
+---------------
+Compatibility:
+* Compatible with libcurl >= 7.50.0
+
 Version 0.9.5
 ---------------
 Fixed Bugs:

README.md

@@ -37,7 +37,7 @@ Manual install (Debian)
 
 GUI
 ===
-If you want to use a GUI to mount your CryFS volumes, take a look at the [cryfs-gui project](https://github.com/mhogomchungu/cryfs-gui). You have to install the GUI **and** also CryFS itself for it to work.
+If you want to use a GUI to mount your CryFS volumes, take a look at the [cryfs-gui project](https://mhogomchungu.github.io/cryfs-gui/). You have to install the GUI **and** also CryFS itself for it to work.
 
 Building from source
 ====================

src/cpp-utils/network/CurlHttpClient.cpp

@@ -3,7 +3,6 @@
 #include "CurlHttpClient.h"
 #include <sstream>
 #include <iostream>
-#include <curl/curl.h>
 #include <curl/easy.h>
 
 using boost::none;

src/cpp-utils/network/CurlHttpClient.h

@@ -4,6 +4,7 @@
 
 #include "HttpClient.h"
 #include "../macros.h"
+#include <curl/curl.h>
 
 namespace cpputils {
 
@@ -16,7 +17,7 @@ namespace cpputils {
         boost::optional <std::string> get(const std::string &url, boost::optional<long> timeoutMsec = boost::none) override;
 
     private:
-        void *curl;
+        CURL *curl;
 
         static size_t write_data(void *ptr, size_t size, size_t nmemb, std::ostringstream *stream);