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

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

@ -226,6 +226,7 @@ namespace fc { namespace http {
fc::async([current_con, request_body, con] {
std::string response = current_con->on_http(request_body);
idump((response));
con->set_body( response );
con->set_status( websocketpp::http::status_code::ok );
con->send_http_response();
@ -348,7 +349,7 @@ namespace fc { namespace http {
auto con = _server.get_con_from_hdl(hdl);
wdump(("server")(con->get_request_body()));
auto response = current_con->on_http( con->get_request_body() );
idump((response));
con->set_body( response );
con->set_status( websocketpp::http::status_code::ok );
} catch ( const fc::exception& e )