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

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

@ -178,11 +178,7 @@ namespace fc { namespace http {
// refresh the cache // refresh the cache
last_forward_header_key = forward_header_key; last_forward_header_key = forward_header_key;
if (!forward_header_key.empty()) if (!forward_header_key.empty())
{
last_ip = get_request_header(forward_header_key); last_ip = get_request_header(forward_header_key);
if (!header_value.empty())
last_ip = header_value;
}
if (last_ip.empty()) if (last_ip.empty())
last_ip = _ws_connection->get_remote_endpoint(); last_ip = _ws_connection->get_remote_endpoint();
} }
@ -207,7 +203,7 @@ namespace fc { namespace http {
_server.init_asio(&fc::asio::default_io_service()); _server.init_asio(&fc::asio::default_io_service());
_server.set_reuse_addr(true); _server.set_reuse_addr(true);
_server.set_open_handler( [&]( connection_hdl hdl ){ _server.set_open_handler( [&]( connection_hdl hdl ){
_server_thread.async( [_server, _connections](){ _server_thread.async( [&](){
auto new_con = std::make_shared<websocket_connection_impl< auto new_con = std::make_shared<websocket_connection_impl<
websocket_server_type::connection_ptr>>( _server.get_con_from_hdl(hdl) ); websocket_server_type::connection_ptr>>( _server.get_con_from_hdl(hdl) );
_on_connection( _connections[hdl] = new_con ); _on_connection( _connections[hdl] = new_con );