Rebase

qgis · Mar 5, 2021 · d02cdd8 · d02cdd8
1 parent 7a8766d
commit d02cdd8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/server/qgis_mapserver.cpp b/src/server/qgis_mapserver.cpp
@@ -27,6 +27,7 @@ while QGIS server internal logging is printed to stderr.
 #include <thread>
 #include <string>
 #include <chrono>
+#include <condition_variable>
 
 //for CMAKE_INSTALL_PREFIX
 #include "qgsconfig.h"
@@ -44,6 +45,7 @@ while QGIS server internal logging is printed to stderr.
 #include <QCommandLineParser>
 #include <QObject>
 #include <QQueue>
+#include <QThread>
 
 
 #ifndef Q_OS_WIN
@@ -152,7 +154,7 @@ class TcpServerWorker: public QObject
         mIsListening = true;
 
         // Incoming connection handler
-        mTcpServer.connect( &mTcpServer, &QTcpServer::newConnection, [ & ]
+        mTcpServer.connect( &mTcpServer, &QTcpServer::newConnection, [ = ]
         {
           QTcpSocket *clientConnection = mTcpServer.nextPendingConnection();
 
@@ -285,7 +287,7 @@ class TcpServerWorker: public QObject
                 // Take Host header if defined
                 if ( headers.contains( QStringLiteral( "Host" ) ) )
                 {
-                  url = QStringLiteral( "http://%1%2" ).arg( headers.value( QStringLiteral( "Host" ) ) ).arg( path );
+                  url = QStringLiteral( "http://%1%2" ).arg( headers.value( QStringLiteral( "Host" ) ), path );
                 }
                 else
                 {