diff options
author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2017-02-23 10:18:43 +0100 |
---|---|---|
committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2017-02-23 20:24:17 +0000 |
commit | 09ca03e1aab7de1dbfcc61b3f95bbf2ede56f89e (patch) | |
tree | 64026afb80596f2977f76fc495cb0f623a41ada9 /src/network/access/qhttpnetworkconnection.cpp | |
parent | 758a56e6628be36df3f11431f9a770c930b13f14 (diff) |
QNAM - rename Redirect*s*Nnn to RedirectNnn
As discussed in API code-review.
Change-Id: Ib54cfd43d5bef8c7d99a7fb3b09a9d16dc1dc1dc
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/network/access/qhttpnetworkconnection.cpp')
-rw-r--r-- | src/network/access/qhttpnetworkconnection.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index fd3cbbe36e..c2458152a3 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -550,15 +550,15 @@ QUrl QHttpNetworkConnectionPrivate::parseRedirectResponse(QAbstractSocket *socke // Check redirect url protocol const QUrl priorUrl(reply->request().url()); if (redirectUrl.scheme() == QLatin1String("http") || redirectUrl.scheme() == QLatin1String("https")) { - switch (reply->request().redirectsPolicy()) { - case QNetworkRequest::NoLessSafeRedirectsPolicy: + switch (reply->request().redirectPolicy()) { + case QNetworkRequest::NoLessSafeRedirectPolicy: // Here we could handle https->http redirects as InsecureProtocolError. // However, if HSTS is enabled and redirectUrl.host() is a known STS // host, then we'll replace its scheme and this won't downgrade protocol, // after all. We cannot access QNAM's STS cache from here, so delegate // this check to QNetworkReplyHttpImpl. break; - case QNetworkRequest::SameOriginRedirectsPolicy: + case QNetworkRequest::SameOriginRedirectPolicy: if (priorUrl.host() != redirectUrl.host() || priorUrl.scheme() != redirectUrl.scheme() || priorUrl.port() != redirectUrl.port()) { @@ -566,7 +566,7 @@ QUrl QHttpNetworkConnectionPrivate::parseRedirectResponse(QAbstractSocket *socke return QUrl(); } break; - case QNetworkRequest::UserVerifiedRedirectsPolicy: + case QNetworkRequest::UserVerifiedRedirectPolicy: break; default: Q_ASSERT(!"Unexpected redirect policy"); |