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 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2fa5777038 - Show all commits

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

@ -6,7 +6,11 @@
#include <websocketpp/client.hpp>
#include <websocketpp/logger/stub.hpp>
#ifdef HAS_ZLIB
#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
#else
#include <websocketpp/extensions/permessage_deflate/disabled.hpp>
#endif
#include <fc/optional.hpp>
#include <fc/variant.hpp>
@ -66,7 +70,11 @@ namespace fc { namespace http {
// permessage_compress extension
struct permessage_deflate_config {};
#ifdef HAS_ZLIB
typedef websocketpp::extensions::permessage_deflate::enabled <permessage_deflate_config> permessage_deflate_type;
#else
typedef websocketpp::extensions::permessage_deflate::disabled <permessage_deflate_config> permessage_deflate_type;
#endif
};
struct asio_tls_with_stub_log : public websocketpp::config::asio_tls {