diff options
Diffstat (limited to 'httpserver')
| -rw-r--r-- | httpserver/httpconnectionhandlerpool.cpp | 2 | ||||
| -rw-r--r-- | httpserver/httpcookie.cpp | 1 | ||||
| -rw-r--r-- | httpserver/httprequest.cpp | 15 |
3 files changed, 11 insertions, 7 deletions
diff --git a/httpserver/httpconnectionhandlerpool.cpp b/httpserver/httpconnectionhandlerpool.cpp index 98f67c99b..74c2aded9 100644 --- a/httpserver/httpconnectionhandlerpool.cpp +++ b/httpserver/httpconnectionhandlerpool.cpp @@ -93,9 +93,9 @@ void HttpConnectionHandlerPool::cleanup() { if (++idleCounter > maxIdleHandlers) { - delete handler; pool.removeOne(handler); qDebug("HttpConnectionHandlerPool: Removed connection handler (%p), pool size is now %i",handler,pool.size()); + delete handler; break; // remove only one handler in each interval } } diff --git a/httpserver/httpcookie.cpp b/httpserver/httpcookie.cpp index 0bc85929c..0f8e5cbd1 100644 --- a/httpserver/httpcookie.cpp +++ b/httpserver/httpcookie.cpp @@ -12,6 +12,7 @@ HttpCookie::HttpCookie() version=1; maxAge=0; secure=false; + httpOnly=false; } HttpCookie::HttpCookie(const QByteArray name, const QByteArray value, const int maxAge, const QByteArray path, const QByteArray comment, const QByteArray domain, const bool secure, const bool httpOnly) diff --git a/httpserver/httprequest.cpp b/httpserver/httprequest.cpp index ec623384e..856f4f008 100644 --- a/httpserver/httprequest.cpp +++ b/httpserver/httprequest.cpp @@ -488,13 +488,16 @@ void HttpRequest::parseMultiPartFile() #ifdef SUPERVERBOSE qDebug("HttpRequest::parseMultiPartFile: finishing writing to uploaded file"); #endif - uploadedFile->resize(uploadedFile->size()-2); - uploadedFile->flush(); - uploadedFile->seek(0); parameters.insert(fieldName,fileName); - qDebug("HttpRequest::parseMultiPartFile: set parameter %s=%s",fieldName.data(),fileName.data()); - uploadedFiles.insert(fieldName,uploadedFile); - qDebug("HttpRequest::parseMultiPartFile: uploaded file size is %i",(int) uploadedFile->size()); + if (uploadedFile) + { + uploadedFile->resize(uploadedFile->size()-2); + uploadedFile->flush(); + uploadedFile->seek(0); + qDebug("HttpRequest::parseMultiPartFile: set parameter %s=%s",fieldName.data(),fileName.data()); + uploadedFiles.insert(fieldName,uploadedFile); + qDebug("HttpRequest::parseMultiPartFile: uploaded file size is %i",(int) uploadedFile->size()); + } } if (line.contains(boundary+"--")) { |