diff --git a/icons.qrc b/icons.qrc index 9de097c3..c0f349f4 100644 --- a/icons.qrc +++ b/icons.qrc @@ -7,6 +7,7 @@ icons/guh-logo-32x32.png icons/guh-logo-48x48.png icons/guh-logo-64x64.png + icons/guh-logo-120x120.png icons/guh-logo-128x128.png icons/guh-logo-256x256.png icons/guh-logo-512x512.png diff --git a/icons/guh-logo-120x120.png b/icons/guh-logo-120x120.png new file mode 100644 index 00000000..52eadf98 Binary files /dev/null and b/icons/guh-logo-120x120.png differ diff --git a/server/httprequest.cpp b/server/httprequest.cpp index 301022e8..662cdacc 100644 --- a/server/httprequest.cpp +++ b/server/httprequest.cpp @@ -215,10 +215,9 @@ void HttpRequest::validate() } // check User-Agent - if (!m_rawHeaderList.contains("User-Agent")) { + if (!m_rawHeaderList.contains("User-Agent")) qWarning() << "User-Agent header is missing"; - return; - } + // verify content length with actual payload if (m_rawHeaderList.contains("Content-Length")) { diff --git a/server/webserver.cpp b/server/webserver.cpp index 4268dc92..e63014fd 100644 --- a/server/webserver.cpp +++ b/server/webserver.cpp @@ -341,7 +341,7 @@ void WebServer::readClient() // check if the request is valid if (!request.isValid()) { - qCWarning(dcWebServer) << "Got invalid request."; + qCWarning(dcWebServer) << "Got invalid request:" << request.url().path(); HttpReply *reply = RestResource::createErrorReply(HttpReply::BadRequest); reply->setClientId(clientId); sendHttpReply(reply); @@ -596,7 +596,7 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address) writer.writeTextElement("mimetype", "image/png"); writer.writeTextElement("width", "8"); writer.writeTextElement("height", "8"); - writer.writeTextElement("depth", "24"); + writer.writeTextElement("depth", "8"); writer.writeTextElement("url", "/icons/guh-logo-8x8.png"); writer.writeEndElement(); // icon @@ -604,7 +604,7 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address) writer.writeTextElement("mimetype", "image/png"); writer.writeTextElement("width", "16"); writer.writeTextElement("height", "16"); - writer.writeTextElement("depth", "24"); + writer.writeTextElement("depth", "8"); writer.writeTextElement("url", "/icons/guh-logo-16x16.png"); writer.writeEndElement(); // icon @@ -612,7 +612,7 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address) writer.writeTextElement("mimetype", "image/png"); writer.writeTextElement("width", "22"); writer.writeTextElement("height", "22"); - writer.writeTextElement("depth", "24"); + writer.writeTextElement("depth", "8"); writer.writeTextElement("url", "/icons/guh-logo-22x22.png"); writer.writeEndElement(); // icon @@ -620,7 +620,7 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address) writer.writeTextElement("mimetype", "image/png"); writer.writeTextElement("width", "32"); writer.writeTextElement("height", "32"); - writer.writeTextElement("depth", "24"); + writer.writeTextElement("depth", "8"); writer.writeTextElement("url", "/icons/guh-logo-32x32.png"); writer.writeEndElement(); // icon @@ -628,7 +628,7 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address) writer.writeTextElement("mimetype", "image/png"); writer.writeTextElement("width", "48"); writer.writeTextElement("height", "48"); - writer.writeTextElement("depth", "24"); + writer.writeTextElement("depth", "8"); writer.writeTextElement("url", "/icons/guh-logo-48x48.png"); writer.writeEndElement(); // icon @@ -636,15 +636,23 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address) writer.writeTextElement("mimetype", "image/png"); writer.writeTextElement("width", "64"); writer.writeTextElement("height", "64"); - writer.writeTextElement("depth", "24"); + writer.writeTextElement("depth", "8"); writer.writeTextElement("url", "/icons/guh-logo-64x64.png"); writer.writeEndElement(); // icon + writer.writeStartElement("icon"); + writer.writeTextElement("mimetype", "image/png"); + writer.writeTextElement("width", "120"); + writer.writeTextElement("height", "120"); + writer.writeTextElement("depth", "8"); + writer.writeTextElement("url", "/icons/guh-logo-120x120.png"); + writer.writeEndElement(); // icon + writer.writeStartElement("icon"); writer.writeTextElement("mimetype", "image/png"); writer.writeTextElement("width", "128"); writer.writeTextElement("height", "128"); - writer.writeTextElement("depth", "24"); + writer.writeTextElement("depth", "8"); writer.writeTextElement("url", "/icons/guh-logo-128x128.png"); writer.writeEndElement(); // icon @@ -652,7 +660,7 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address) writer.writeTextElement("mimetype", "image/png"); writer.writeTextElement("width", "256"); writer.writeTextElement("height", "256"); - writer.writeTextElement("depth", "24"); + writer.writeTextElement("depth", "8"); writer.writeTextElement("url", "/icons/guh-logo-256x256.png"); writer.writeEndElement(); // icon @@ -660,7 +668,7 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address) writer.writeTextElement("mimetype", "image/png"); writer.writeTextElement("width", "512"); writer.writeTextElement("height", "512"); - writer.writeTextElement("depth", "24"); + writer.writeTextElement("depth", "8"); writer.writeTextElement("url", "/icons/guh-logo-512x512.png"); writer.writeEndElement(); // icon