hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/output/output.cpp
This commit is contained in:
Thulinma 2018-08-30 13:53:21 +02:00
commit c392e3f6f9
3 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/output/output_http.cpp
View file

@ -268,6 +268,7 @@ namespace Mist {
//Handle upgrade to websocket if the output supports it
if (doesWebsockets() && H.GetHeader("Upgrade") == "websocket"){
INFO_MSG("Switching to Websocket mode");
setBlocking(false);
preWebsocketConnect();
webSock = new HTTP::Websocket(myConn, H);
if (!(*webSock)){