Adds latest migration results
This commit is contained in:
829 files changed
+35074
-70886
No files matched your search
@@ -1,6 +1,8 @@
|
||||
#include <QtNetwork/QTcpServer>
|
||||
#include <QtNetwork/QTcpSocket>
|
||||
#ifdef QT6_WEBSOCKETS_AVAILABLE
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#endif
|
||||
#include <httq/AbstractServer.h>
|
||||
#include <httq/HttpRequest.h>
|
||||
#include <httq/Logger.h>
|
||||
@@ -43,6 +45,7 @@ void AbstractServer::slotNewConnection()
|
||||
connect(req, &HttpRequest::signalUpgrade, this, [this, req](QTcpSocket* sock) {
|
||||
mLogger->debug(QStringLiteral("signalUpgrade"));
|
||||
|
||||
#ifdef QT6_WEBSOCKETS_AVAILABLE
|
||||
QWebSocketServer* wsSvr = webSocketServer();
|
||||
|
||||
if (wsSvr == nullptr)
|
||||
@@ -54,6 +57,12 @@ void AbstractServer::slotNewConnection()
|
||||
}
|
||||
|
||||
wsSvr->handleConnection(sock);
|
||||
#else
|
||||
mLogger->debug(QStringLiteral("websocket support not available"));
|
||||
sock->close();
|
||||
sock->deleteLater();
|
||||
return;
|
||||
#endif
|
||||
emit sock->readyRead();
|
||||
});
|
||||
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
# Modified CMakeLists.txt from github.com/wille-io/httq
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
set(src
|
||||
include/http_parser.h
|
||||
include/http_parser.c # TODO: move out of include dir
|
||||
@@ -26,7 +34,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(httq
|
||||
NGL_TARGET_LINK_LIBRARIES(httq
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(httq)
|
||||
@@ -6,7 +6,9 @@
|
||||
#include <QtCore/QObject>
|
||||
|
||||
class QTcpServer;
|
||||
#ifdef QT6_WEBSOCKETS_AVAILABLE
|
||||
class QWebSocketServer;
|
||||
#endif
|
||||
|
||||
namespace httq
|
||||
{
|
||||
@@ -22,10 +24,12 @@ class HTTQ_EXPORT AbstractServer : public QObject
|
||||
|
||||
virtual bool newHttpConnection(HttpRequest* request) = 0;
|
||||
|
||||
#ifdef QT6_WEBSOCKETS_AVAILABLE
|
||||
virtual QWebSocketServer* webSocketServer() const
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
#endif
|
||||
|
||||
virtual LoggerFactory* createLoggerFactory();
|
||||
LoggerFactory* getLoggerFactory();
|
||||
|
||||
Reference in new issue
Block a user