github-personal/sysadm
1
0
Fork 0
mirror of https://github.com/outbackdingo/sysadm.git synced 2026-01-27 10:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pcbsd/sysadm

Browse Source
This commit is contained in:
Kris Moore
2016-01-05 15:54:42 -05:00
parent 9531f29a84 838a5d9f60
commit 9b62a01288
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/RestStructs.h
View File

@@ -39,15 +39,17 @@ public:
if(message.isEmpty()){ return; }
//Pull out any REST headers
Body = message;
qDebug() << "Raw Message:" << message;
if(!message.startsWith("{")){
Header = message.section("\n{",0,0).split("\n");
Header = message.section("{",0,0).split("\n");
Body = "{"+message.section("{",1, 1000000);
}
if(!Header.isEmpty()){
QString line = Header.takeFirst(); //The first line is special (not a generic header)
VERB = line.section(" ",0,0);
URI = line.section(" ",1,1);
HTTPVERSION = line.section(" ",2,2);
Body = message.remove(Header.join("\n")+"\n"); //chop the headers off the front
//Body = message.remove(Header.join("\n")+"\n"); //chop the headers off the front
if(!Header.filter("Authorization:").isEmpty()){
line = Header.filter("Authorization:").takeFirst().section("Authorization: ",1,50).simplified();
if(line.section(" ",0,0).toLower()=="basic"){

9
src/server/WebSocket.cpp
View File

@@ -5,6 +5,8 @@
// =================================
#include "WebSocket.h"
#include <unistd.h>
#define DEBUG 1
#define IDLETIMEOUTMINS 30
@@ -304,7 +306,12 @@ void WebSocket::EvaluateTcpMessage(){
//Need to read the data from the Tcp socket and turn it into a string
qDebug() << "New TCP Message:";
if(idletimer->isActive()){ idletimer->stop(); }
EvaluateREST( QString(TSOCKET->readAll()) );
QString msg = QString(TSOCKET->readAll());
for(int i=0; i<5 && !msg.endsWith("}"); i++){
usleep(10000); //10ms
msg.append( QString(TSOCKET->readAll()) );
}
EvaluateREST(msg );
idletimer->start();
qDebug() << " - Done with TCP Message";
}