diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-02 09:04:38 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-02 09:04:38 +0100 |
commit | 71264bae08d81bdeceb96133fdb01c370504dfcc (patch) | |
tree | d5dadaac8209d5ef1857a4d65197b9ee12b39848 /src/network/access/qnetworkrequest.cpp | |
parent | 5e785c0b83c9908c665f253c131629ac325a21f5 (diff) | |
parent | 6d10f739cd750968d0dd0e9d8fa4b64353a86c6c (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I84097f8e7b3b2128028bd7693c913d6968b82bfe
Diffstat (limited to 'src/network/access/qnetworkrequest.cpp')
-rw-r--r-- | src/network/access/qnetworkrequest.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index 169695fa27..e95187de30 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -289,9 +289,9 @@ QT_BEGIN_NAMESPACE marked to be decompressed automatically. (This value was introduced in 5.9.) - \value RedirectsPolicyAttribute + \value RedirectPolicyAttribute Requests only, type: QMetaType::Int, should be one of the - QNetworkRequest::RedirectsPolicy values (default: ManualRedirectsPolicy). + QNetworkRequest::RedirectPolicy values (default: ManualRedirectPolicy). This attribute obsoletes FollowRedirectsAttribute. (This value was introduced in 5.9.) @@ -343,33 +343,33 @@ QT_BEGIN_NAMESPACE */ /*! - \enum QNetworkRequest::RedirectsPolicy + \enum QNetworkRequest::RedirectPolicy \since 5.9 Indicates whether the Network Access API should automatically follow a HTTP redirect response or not. - \value ManualRedirectsPolicy Default value: not following any redirects. - - \value NoLessSafeRedirectsPolicy Only "http"->"http", "http" -> "https" - or "https" -> "https" redirects are allowed. - Equivalent to setting the old FollowRedirectsAttribute - to true - - \value SameOriginRedirectsPolicy Require the same protocol, host and port. - Note, http://example.com and http://example.com:80 - will fail with this policy (implicit/explicit ports - are considered to be a mismatch). - - \value UserVerifiedRedirectsPolicy Client decides whether to follow each - redirect by handling the redirected() - signal, emitting redirectAllowed() on - the QNetworkReply object to allow - the redirect or aborting/finishing it to - reject the redirect. This can be used, - for example, to ask the user whether to - accept the redirect, or to decide - based on some app-specific configuration. + \value ManualRedirectPolicy Default value: not following any redirects. + + \value NoLessSafeRedirectPolicy Only "http"->"http", "http" -> "https" + or "https" -> "https" redirects are allowed. + Equivalent to setting the old FollowRedirectsAttribute + to true + + \value SameOriginRedirectPolicy Require the same protocol, host and port. + Note, http://example.com and http://example.com:80 + will fail with this policy (implicit/explicit ports + are considered to be a mismatch). + + \value UserVerifiedRedirectPolicy Client decides whether to follow each + redirect by handling the redirected() + signal, emitting redirectAllowed() on + the QNetworkReply object to allow + the redirect or aborting/finishing it to + reject the redirect. This can be used, + for example, to ask the user whether to + accept the redirect, or to decide + based on some app-specific configuration. */ class QNetworkRequestPrivate: public QSharedData, public QNetworkHeadersPrivate |