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/qnetworkreplyhttpimpl.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/qnetworkreplyhttpimpl.cpp')
-rw-r--r-- | src/network/access/qnetworkreplyhttpimpl.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp index ece08acc6b..5cd0747e34 100644 --- a/src/network/access/qnetworkreplyhttpimpl.cpp +++ b/src/network/access/qnetworkreplyhttpimpl.cpp @@ -668,14 +668,14 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest &newHttpReq } #endif - auto redirectsPolicy = QNetworkRequest::ManualRedirectsPolicy; - const QVariant value = newHttpRequest.attribute(QNetworkRequest::RedirectsPolicyAttribute); + auto redirectPolicy = QNetworkRequest::ManualRedirectPolicy; + const QVariant value = newHttpRequest.attribute(QNetworkRequest::RedirectPolicyAttribute); if (value.isValid()) - redirectsPolicy = value.value<QNetworkRequest::RedirectsPolicy>(); + redirectPolicy = value.value<QNetworkRequest::RedirectPolicy>(); else if (newHttpRequest.attribute(QNetworkRequest::FollowRedirectsAttribute).toBool()) - redirectsPolicy = QNetworkRequest::NoLessSafeRedirectsPolicy; + redirectPolicy = QNetworkRequest::NoLessSafeRedirectPolicy; - httpRequest.setRedirectsPolicy(redirectsPolicy); + httpRequest.setRedirectPolicy(redirectPolicy); httpRequest.setPriority(convert(newHttpRequest.priority())); @@ -1155,7 +1155,7 @@ void QNetworkReplyHttpImplPrivate::onRedirected(const QUrl &redirectUrl, int htt const bool isLessSafe = schemeBefore == QLatin1String("https") && url.scheme() == QLatin1String("http"); - if (httpRequest.redirectsPolicy() == QNetworkRequest::NoLessSafeRedirectsPolicy + if (httpRequest.redirectPolicy() == QNetworkRequest::NoLessSafeRedirectPolicy && isLessSafe) { error(QNetworkReply::InsecureRedirectError, QCoreApplication::translate("QHttp", "Insecure redirect")); @@ -1165,7 +1165,7 @@ void QNetworkReplyHttpImplPrivate::onRedirected(const QUrl &redirectUrl, int htt redirectRequest = createRedirectRequest(originalRequest, url, maxRedirectsRemaining); operation = getRedirectOperation(operation, httpStatus); - if (httpRequest.redirectsPolicy() != QNetworkRequest::UserVerifiedRedirectsPolicy) + if (httpRequest.redirectPolicy() != QNetworkRequest::UserVerifiedRedirectPolicy) followRedirect(); emit q->redirected(url); |