mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-14 02:54:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update QtWebApp to 1.8.3

Browse Source 
nullptr redefinition for old __cplusplus versions has been removed, the rest is vanilla
This commit is contained in:
Luis Ángel San Martín
2021-10-03 21:17:49 +02:00
parent baccb1a21b
commit 986450eb20
20 changed files with 131 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
third_party/QtWebApp/httpserver/httpsessionstore.cpp vendored
View File

@ -13,7 +13,7 @@ HttpSessionStore::HttpSessionStore(const QSettings *settings, QObject* parent)
:QObject(parent)
{
this->settings=settings;
connect(&cleanupTimer,&QTimer::timeout,this,&HttpSessionStore::sessionTimerEvent);
connect(&cleanupTimer,SIGNAL(timeout()),this,SLOT(sessionTimerEvent()));
cleanupTimer.start(60000);
cookieName=settings->value("cookieName","sessionid").toByteArray();
expirationTime=settings->value("expirationTime",3600000).toInt();
@ -64,7 +64,8 @@ HttpSession HttpSessionStore::getSession(HttpRequest& request, HttpResponse& res
QByteArray cookiePath=settings->value("cookiePath").toByteArray();
QByteArray cookieComment=settings->value("cookieComment").toByteArray();
QByteArray cookieDomain=settings->value("cookieDomain").toByteArray();
response.setCookie(HttpCookie(cookieName,session.getId(),expirationTime/1000,cookiePath,cookieComment,cookieDomain));
response.setCookie(HttpCookie(cookieName,session.getId(),expirationTime/1000,
cookiePath,cookieComment,cookieDomain,false,false,"Lax"));
session.setLastAccess();
return session;
}
@ -79,7 +80,8 @@ HttpSession HttpSessionStore::getSession(HttpRequest& request, HttpResponse& res
HttpSession session(true);
qDebug("HttpSessionStore: create new session with ID %s",session.getId().data());
sessions.insert(session.getId(),session);
response.setCookie(HttpCookie(cookieName,session.getId(),expirationTime/1000,cookiePath,cookieComment,cookieDomain));
response.setCookie(HttpCookie(cookieName,session.getId(),expirationTime/1000,
cookiePath,cookieComment,cookieDomain,false,false,"Lax"));
mutex.unlock();
return session;
}
@ -111,6 +113,7 @@ void HttpSessionStore::sessionTimerEvent()
if (now-lastAccess>expirationTime)
{
qDebug("HttpSessionStore: session %s expired",session.getId().data());
emit sessionDeleted(session.getId());
sessions.erase(prev);
}
}
@ -122,6 +125,7 @@ void HttpSessionStore::sessionTimerEvent()
void HttpSessionStore::removeSession(HttpSession session)
{
mutex.lock();
emit sessionDeleted(session.getId());
sessions.remove(session.getId());
mutex.unlock();
}