Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FC Updates from BitShares and myself #21

Closed
nathanielhourt wants to merge 687 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 687 Files changed 314 +7
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b29da15d51 - Show all commits

7
src/network/http/websocket.cpp
View file

@ -6,6 +6,8 @@
#include <websocketpp/client.hpp> #include <websocketpp/client.hpp>
#include <websocketpp/logger/stub.hpp> #include <websocketpp/logger/stub.hpp>
#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
#include <fc/optional.hpp> #include <fc/optional.hpp>
#include <fc/variant.hpp> #include <fc/variant.hpp>
#include <fc/thread/thread.hpp> #include <fc/thread/thread.hpp>
@ -61,6 +63,11 @@ namespace fc { namespace http {
transport_type; transport_type;
static const long timeout_open_handshake = 0; static const long timeout_open_handshake = 0;
// permessage_compress extension
struct permessage_deflate_config {};
typedef websocketpp::extensions::permessage_deflate::enabled <permessage_deflate_config> permessage_deflate_type;
}; };
struct asio_tls_with_stub_log : public websocketpp::config::asio_tls { struct asio_tls_with_stub_log : public websocketpp::config::asio_tls {