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

Updates from BitShares FC #22

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

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

@ -6,6 +6,8 @@
#include <websocketpp/client.hpp>
#include <websocketpp/logger/stub.hpp>
#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
#include <fc/optional.hpp>
#include <fc/variant.hpp>
#include <fc/thread/thread.hpp>
@ -61,6 +63,11 @@ namespace fc { namespace http {
transport_type;
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 {

2
vendor/websocketpp vendored

@ -1 +1 @@
Subproject commit 792cb455bec45837d8d801e82c6fd86c38e1dbdb
Subproject commit 4543c5f9860333e9c73552362ae74239f98e80fe