ETM-Schurig
/
nymea-plugins
mirror of https://github.com/nymea/nymea-plugins.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

cleaned up http server

pull/183/head
Boernsman 2019-11-19 17:51:04 +01:00
parent 8a0d30605b
commit e365e16537
2 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
httpcommander/devicepluginhttpcommander.cpp
View File

@ -47,7 +47,6 @@ void DevicePluginHttpCommander::setupDevice(DeviceSetupInfo *info)
//: Error setting up device
return info->finish(Device::DeviceErrorInvalidParameter, QT_TR_NOOP("The given url is not valid."));
}
return info->finish(Device::DeviceErrorNoError);
}

38
httpcommander/httpsimpleserver.cpp
View File

@ -42,7 +42,6 @@ HttpSimpleServer::HttpSimpleServer(QObject *parent):
HttpSimpleServer::~HttpSimpleServer()
{
close();
}
void HttpSimpleServer::incomingConnection(qintptr socket)
@ -68,42 +67,13 @@ void HttpSimpleServer::readClient()
QByteArray data = tcpSocket->readAll();
QStringList tokens = QString(data).split(QRegExp("[ \r\n][ \r\n]*"));
//QUrl url("http://foo.bar" + tokens[1]);
//QUrlQuery query(url);
qCDebug(dcHttpCommander()) << "Http Request, type" << tokens[0] << "path" << tokens[1] << "body" << tokens.last();
if (tokens[0] == "GET") {
QTextStream os(tcpSocket);
os.setAutoDetectUnicode(true);
os << generateHeader();
tcpSocket->close();
if ((tokens[0] == "GET") ||
(tokens[0] == "PUT") ||
(tokens[0] == "POST") ||
(tokens[0] == "DELETE")) {
if (tcpSocket->state() == QTcpSocket::UnconnectedState)
delete tcpSocket;
emit requestReceived(tokens[0], tokens[1], tokens.last());
} else if (tokens[0] == "PUT") {
QTextStream os(tcpSocket);
os.setAutoDetectUnicode(true);
os << generateHeader();
tcpSocket->close();
if (tcpSocket->state() == QTcpSocket::UnconnectedState)
delete tcpSocket;
emit requestReceived(tokens[0], tokens[1], tokens.last());
} else if (tokens[0] == "POST") {
QTextStream os(tcpSocket);
os.setAutoDetectUnicode(true);
os << generateHeader();
tcpSocket->close();
if (tcpSocket->state() == QTcpSocket::UnconnectedState)
delete tcpSocket;
emit requestReceived(tokens[0], tokens[1], tokens.last());
} else if (tokens[0] == "DELETE") {
QTextStream os(tcpSocket);
os.setAutoDetectUnicode(true);
os << generateHeader();