VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-01 21:54:55 -04:00
Code Issues Projects Releases Wiki Activity

Http server: fixed parameters passing

Browse Source
This commit is contained in:
f4exb
2017-11-18 10:15:29 +01:00
parent 7305f2fb00
commit 2b65fb2d62
8 changed files with 57 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
httpserver/httpconnectionhandler.cpp
+24 -18
View File
@@ -11,12 +11,13 @@ using namespace qtwebapp;
HttpConnectionHandler::HttpConnectionHandler(QSettings* settings, HttpRequestHandler* requestHandler, QSslConfiguration* sslConfiguration)
: QThread(), useQtSettings(true)
{
Q_ASSERT(settings!=0);
Q_ASSERT(requestHandler!=0);
this->settings=settings;
this->requestHandler=requestHandler;
this->sslConfiguration=sslConfiguration;
currentRequest=0;
Q_ASSERT(settings != 0);
Q_ASSERT(requestHandler != 0);
this->settings = settings;
this->listenerSettings = 0;
this->requestHandler = requestHandler;
this->sslConfiguration = sslConfiguration;
currentRequest = 0;
busy=false;
// Create TCP or SSL socket
@@ -37,16 +38,17 @@ HttpConnectionHandler::HttpConnectionHandler(QSettings* settings, HttpRequestHan
this->start();
}
HttpConnectionHandler::HttpConnectionHandler(const HttpListenerSettings& settings, HttpRequestHandler* requestHandler, QSslConfiguration* sslConfiguration)
HttpConnectionHandler::HttpConnectionHandler(const HttpListenerSettings* settings, HttpRequestHandler* requestHandler, QSslConfiguration* sslConfiguration)
: QThread(), useQtSettings(false)
{
Q_ASSERT(requestHandler!=0);
this->settings=0;
listenerSettings=settings;
this->requestHandler=requestHandler;
this->sslConfiguration=sslConfiguration;
currentRequest=0;
busy=false;
Q_ASSERT(settings != 0);
Q_ASSERT(requestHandler != 0);
this->settings = 0;
this->listenerSettings = settings;
this->requestHandler = requestHandler;
this->sslConfiguration = sslConfiguration;
currentRequest = 0;
busy = false;
// Create TCP or SSL socket
createSocket();
@@ -138,7 +140,7 @@ void HttpConnectionHandler::handleConnection(tSocketDescriptor socketDescriptor)
#endif
// Start timer for read timeout
int readTimeout = useQtSettings ? settings->value("readTimeout",10000).toInt() : listenerSettings.readTimeout;
int readTimeout = useQtSettings ? settings->value("readTimeout",10000).toInt() : listenerSettings->readTimeout;
readTimer.start(readTimeout);
// delete previous request
delete currentRequest;
@@ -191,7 +193,11 @@ void HttpConnectionHandler::read()
// Create new HttpRequest object if necessary
if (!currentRequest)
{
currentRequest=new HttpRequest(settings);
if (useQtSettings) {
currentRequest = new HttpRequest(settings);
} else {
currentRequest = new HttpRequest(listenerSettings);
}
}
// Collect data for the request object
@@ -202,7 +208,7 @@ void HttpConnectionHandler::read()
{
// Restart timer for read timeout, otherwise it would
// expire during large file uploads.
int readTimeout = useQtSettings ? settings->value("readTimeout",10000).toInt() : listenerSettings.readTimeout;
int readTimeout = useQtSettings ? settings->value("readTimeout",10000).toInt() : listenerSettings->readTimeout;
readTimer.start(readTimeout);
}
}
@@ -296,7 +302,7 @@ void HttpConnectionHandler::read()
else
{
// Start timer for next request
int readTimeout = useQtSettings ? settings->value("readTimeout",10000).toInt() : listenerSettings.readTimeout;
int readTimeout = useQtSettings ? settings->value("readTimeout",10000).toInt() : listenerSettings->readTimeout;
readTimer.start(readTimeout);
}
delete currentRequest;