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 +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 e50067d6ed - Show all commits

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

@ -370,7 +370,7 @@ namespace fc { namespace http {
std::string request_body = con->get_request_body(); std::string request_body = con->get_request_body();
wlog( "[IN] ${remote_endpoint} ${msg}", wlog( "[IN] ${remote_endpoint} ${msg}",
("remote_endpoint",remote_endpoint) ("msg",request_body) ); ("remote_endpoint",remote_endpoint) ("msg",request_body) );
auto response = current_con->on_http( con->get_request_body() ); auto response = current_con->on_http( request_body );
ilog( "[OUT] ${remote_endpoint} ${msg}", ilog( "[OUT] ${remote_endpoint} ${msg}",
("remote_endpoint",remote_endpoint) ("msg",response) ); ("remote_endpoint",remote_endpoint) ("msg",response) );
con->set_body( std::move( response.body_as_string ) ); con->set_body( std::move( response.body_as_string ) );
@ -707,7 +707,7 @@ namespace fc { namespace http {
void websocket_client::append_header(const std::string& key, const std::string& value) void websocket_client::append_header(const std::string& key, const std::string& value)
{ {
headers.push_back( std::pair<std::string,std::string>(key, value)); headers.push_back( std::make_pair(key, value) );
} }
websocket_connection_ptr websocket_tls_client::connect( const std::string& uri ) websocket_connection_ptr websocket_tls_client::connect( const std::string& uri )