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

4
include/fc/network/http/websocket.hpp
View file

@ -53,7 +53,7 @@ namespace fc { namespace http {
class websocket_server class websocket_server
{ {
public: public:
websocket_server(const std::string& forward_header_key); websocket_server(const std::string& forward_header_key = std::string());
~websocket_server(); ~websocket_server();
void on_connection( const on_connection_handler& handler); void on_connection( const on_connection_handler& handler);
@ -78,7 +78,7 @@ namespace fc { namespace http {
public: public:
websocket_tls_server( const std::string& server_pem, websocket_tls_server( const std::string& server_pem,
const std::string& ssl_password, const std::string& ssl_password,
const std::string& forward_header_key ); const std::string& forward_header_key = std::string() );
~websocket_tls_server(); ~websocket_tls_server();
void on_connection( const on_connection_handler& handler); void on_connection( const on_connection_handler& handler);