Put web server for API in place in the main window (1)

httpserver/httpconnectionhandlerpool.cpp

@@ -66,7 +66,12 @@ HttpConnectionHandler* HttpConnectionHandlerPool::getConnectionHandler()
         int maxConnectionHandlers = useQtSettings ? settings->value("maxThreads",100).toInt() : listenerSettings.maxThreads;
         if (pool.count()<maxConnectionHandlers)
         {
-            freeHandler=new HttpConnectionHandler(settings,requestHandler,sslConfiguration);
+            if (useQtSettings) {
+                freeHandler = new HttpConnectionHandler(settings, requestHandler, sslConfiguration);
+            } else {
+                freeHandler = new HttpConnectionHandler(listenerSettings, requestHandler, sslConfiguration);
+            }
+
             freeHandler->setBusy();
             pool.append(freeHandler);
         }

httpserver/httplistener.cpp

@@ -51,7 +51,11 @@ void HttpListener::listen()
 {
     if (!pool)
     {
-        pool=new HttpConnectionHandlerPool(settings,requestHandler);
+        if (useQtSettings) {
+            pool = new HttpConnectionHandlerPool(settings, requestHandler);
+        } else {
+            pool = new HttpConnectionHandlerPool(listenerSettings, requestHandler);
+        }
     }
     QString host = useQtSettings ? settings->value("host").toString() : listenerSettings.host;
     int port = useQtSettings ? settings->value("port").toInt() : listenerSettings.port;

httpserver/httprequest.cpp

@@ -12,7 +12,8 @@
 
 using namespace qtwebapp;
 
-HttpRequest::HttpRequest(QSettings* settings)
+HttpRequest::HttpRequest(QSettings* settings) :
+        useQtSettings(true)
 {
     status=waitForRequest;
     currentSize=0;
@@ -22,7 +23,8 @@ HttpRequest::HttpRequest(QSettings* settings)
     tempFile=0;
 }
 
-HttpRequest::HttpRequest(const HttpListenerSettings& settings)
+HttpRequest::HttpRequest(const HttpListenerSettings& settings) :
+        useQtSettings(false)
 {
     status=waitForRequest;
     currentSize=0;

httpserver/httprequest.h

@@ -239,6 +239,8 @@ private:
     /** Buffer for collecting characters of request and header lines */
     QByteArray lineBuffer;
 
+    /** Settings flag */
+    bool useQtSettings;
 };
 
 } // end of namespace