Merge pull request #14546 from glassez/regexp

Use QRegularExpression instead of deprecated QRegExp
This commit is contained in:
Vladimir Golovnev
2021-03-22 10:14:02 +03:00
committed by GitHub
11 changed files with 53 additions and 32 deletions

View File

@@ -38,7 +38,7 @@
#include <QMimeDatabase>
#include <QMimeType>
#include <QNetworkCookie>
#include <QRegExp>
#include <QRegularExpression>
#include <QUrl>
#include "base/algorithm.h"
@@ -693,7 +693,7 @@ bool WebApplication::validateHostHeader(const QStringList &domains) const
// try matching host header with domain list
for (const auto &domain : domains)
{
QRegExp domainRegex(domain, Qt::CaseInsensitive, QRegExp::Wildcard);
const QRegularExpression domainRegex {Utils::String::wildcardToRegexPattern(domain), QRegularExpression::CaseInsensitiveOption};
if (requestHost.contains(domainRegex))
return true;
}