diff options
| author | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-04-14 15:08:32 +0000 |
|---|---|---|
| committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-04-14 15:08:32 +0000 |
| commit | 5341569b41f0e5e2602fde0e88ceeac399a1f60f (patch) | |
| tree | a6b6c477c1a57ba4d248edf5e6a41cbd95eb0940 /src/network/access/qnetworkcookie.cpp | |
| parent | fb0fcd7fe3f94a227dd66a110f5a3353008e37e5 (diff) | |
| parent | f4d791b330d02777fcaf02938732892eb3167e9b (diff) | |
Merge integration refs/builds/qtci/dev/1618401544
Diffstat (limited to 'src/network/access/qnetworkcookie.cpp')
| -rw-r--r-- | src/network/access/qnetworkcookie.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/network/access/qnetworkcookie.cpp b/src/network/access/qnetworkcookie.cpp index cfc3b14c9e9..13fc147c15a 100644 --- a/src/network/access/qnetworkcookie.cpp +++ b/src/network/access/qnetworkcookie.cpp @@ -227,9 +227,9 @@ void QNetworkCookie::setSecure(bool enable) string, \c SameSite::Default if not present. \since 6.1 - \sa setSameSite() + \sa setSameSitePolicy() */ -QNetworkCookie::SameSite QNetworkCookie::sameSite() const +QNetworkCookie::SameSite QNetworkCookie::sameSitePolicy() const { return d->sameSite; } @@ -238,9 +238,9 @@ QNetworkCookie::SameSite QNetworkCookie::sameSite() const Sets the "SameSite" option of this cookie to \a sameSite. \since 6.1 - \sa sameSite() + \sa sameSitePolicy() */ -void QNetworkCookie::setSameSite(QNetworkCookie::SameSite sameSite) +void QNetworkCookie::setSameSitePolicy(QNetworkCookie::SameSite sameSite) { d->sameSite = sameSite; } @@ -469,7 +469,7 @@ static QPair<QByteArray, QByteArray> nextField(const QByteArray &text, int &posi This is the default in modern browsers (since mid 2020). \value Strict Cookies will only be sent in a first-party context. - \sa setSameSite(), sameSite() + \sa setSameSitePolicy(), sameSitePolicy() */ namespace { @@ -1065,7 +1065,7 @@ QList<QNetworkCookie> QNetworkCookiePrivate::parseSetCookieHeaderLine(const QByt } else if (field.first == "httponly") { cookie.setHttpOnly(true); } else if (field.first == "samesite") { - cookie.setSameSite(sameSiteFromRawString(field.second)); + cookie.setSameSitePolicy(sameSiteFromRawString(field.second)); } else { // ignore unknown fields in the cookie (RFC6265 section 5.2, rule 6) } |