ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-11-28 14:35:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make "wss" work the same as "wss2"

Browse Source
This commit is contained in:
JoelKatz
2017-02-28 12:27:02 -08:00
committed by seelabs
parent 35f4698aed
commit 0c97dda276
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ripple/rpc/impl/ServerHandlerImp.cpp
View File

@@ -185,9 +185,13 @@ ServerHandlerImp::onHandoff (Session& session,
boost::asio::ip::tcp::endpoint remote_address) ->
Handoff
{
const bool is_ws =
(session.port().protocol.count("wss") > 0) ||
(session.port().protocol.count("wss2") > 0);
if(isWebsocketUpgrade(request))
{
if(session.port().protocol.count("wss2") > 0)
if(is_ws)
{
Handoff handoff;
auto const ws = session.websocketUpgrade();
@@ -202,9 +206,6 @@ ServerHandlerImp::onHandoff (Session& session,
return handoff;
}
if(session.port().protocol.count("wss") > 0)
return {}; // Pass to websocket
return unauthorizedResponse(request);
}
@@ -214,7 +215,7 @@ ServerHandlerImp::onHandoff (Session& session,
std::move(request), remote_address);
}
if (session.port().protocol.count("wss2") > 0 && isStatusRequest(request))
if (is_ws && isStatusRequest(request))
return statusResponse(request);
// Pass to legacy onRequest