hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Make compatible with libcurl >= 7.50

Browse Source
This commit is contained in:
Sebastian Messmer 2016-07-23 09:04:50 +02:00
parent 5442662dd1
commit 6360d452fe
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.txt
View File

@ -1,3 +1,8 @@
Version 0.9.6 (unreleased)
---------------
Compatibility:
* Compatible with libcurl >= 7.50.0
Version 0.9.5 Version 0.9.5
--------------- ---------------
Fixed Bugs: Fixed Bugs:

1
src/cpp-utils/network/CurlHttpClient.cpp
View File

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

3
src/cpp-utils/network/CurlHttpClient.h
View File

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