ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove websocketpp support (RIPD-1293)

Browse Source
This commit is contained in:
Mike Ellery
2016-11-19 19:55:14 -08:00
committed by Nik Bougalis
parent 8d83aa5c07
commit 3d0314c621
262 changed files with 18 additions and 49797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -230,7 +230,8 @@ ServerHandlerImp::onHandoff (Session& session,
{
if(isWebsocketUpgrade(request))
{
if (session.port().protocol.count("ws2") > 0)
if (session.port().protocol.count("ws2") > 0 ||
session.port().protocol.count("ws") > 0)
{
Handoff handoff;
auto const ws = session.websocketUpgrade();
@@ -247,7 +248,9 @@ ServerHandlerImp::onHandoff (Session& session,
return unauthorizedResponse(request);
}
if (session.port().protocol.count("ws2") > 0 && isStatusRequest(request))
if ((session.port().protocol.count("ws") > 0 ||
session.port().protocol.count("ws2") > 0) &&
isStatusRequest(request))
return statusResponse(request);
// Otherwise pass to legacy onRequest or websocket
@@ -812,14 +815,6 @@ to_Port(ParsedPort const& parsed, std::ostream& log)
Throw<std::exception> ();
}
p.protocol = parsed.protocol;
if (p.websockets() &&
(parsed.protocol.count("peer") > 0 ||
parsed.protocol.count("http") > 0 ||
parsed.protocol.count("https") > 0))
{
log << "Invalid protocol combination in [" << p.name << "]\n";
Throw<std::exception> ();
}
p.user = parsed.user;
p.password = parsed.password;