diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2016-12-28 15:27:57 +0100 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2017-01-17 18:51:32 +0000 |
| commit | cebf1fea4a6802b8999469f647f52171e87d02b6 (patch) | |
| tree | ca858bb7eb3b482d1e555c285b08c0e627497256 /src/network/access/qnetworkrequest.h | |
| parent | 27e27966bf01b4c42343100a49b1dd6b014025fe (diff) | |
Add redirects policy to QNetworkAccessManager
This patch makes it possible to enable/disable redirects on QNAM
level (before it was per-request only). This policy would be applied
to all subsequent requests* created by QNAM.
The policies we support at the moment:
a. Manual - that's what we always had - it's up to a user to handle
redirects.
b. NoLessSafeRedirectsPolicy - we allow http->http, http->https and
https->https redirects, but no protocol 'downgrade' (no
https->http redirects).
c. SameOriginPolicy - we check that protocol/host/port are
the same.
Updated tst_qnetworkreply.
*We previously were enabling redirect for each request, by
setting FollowRedirectsAttribute on QNetworkRequest object.
For backward compatibility this attribute has a higher priority
(if set) than QNAM's policy (and it will work as NoLessSafeRedirectsPolicy).
[ChangeLog][QtNetwork] Added redirects policy to QNAM
Task-number: QTPM-239
Task-number: QTPM-237
Change-Id: I493d1728254b71b61b5504937e8e01dca5953527
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/access/qnetworkrequest.h')
| -rw-r--r-- | src/network/access/qnetworkrequest.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h index 9a3a7f0fb5..52c398663a 100644 --- a/src/network/access/qnetworkrequest.h +++ b/src/network/access/qnetworkrequest.h @@ -48,7 +48,6 @@ QT_BEGIN_NAMESPACE - class QSslConfiguration; class QNetworkRequestPrivate; @@ -92,6 +91,7 @@ public: HTTP2AllowedAttribute, HTTP2WasUsedAttribute, OriginalContentLengthAttribute, + RedirectsPolicyAttribute, User = 1000, UserMax = 32767 @@ -113,6 +113,13 @@ public: LowPriority = 5 }; + enum RedirectsPolicy { + ManualRedirectsPolicy, + NoLessSafeRedirectsPolicy, + SameOriginRedirectsPolicy + }; + + explicit QNetworkRequest(const QUrl &url = QUrl()); QNetworkRequest(const QNetworkRequest &other); ~QNetworkRequest(); @@ -169,5 +176,6 @@ Q_DECLARE_SHARED(QNetworkRequest) QT_END_NAMESPACE Q_DECLARE_METATYPE(QNetworkRequest) +Q_DECLARE_METATYPE(QNetworkRequest::RedirectsPolicy) #endif |