|
|
|
|
@ -11,12 +11,13 @@ using namespace qtwebapp;
@@ -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
@@ -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)
@@ -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()
@@ -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()
@@ -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()
@@ -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; |
|
|
|
|
|