diff options
| author | Jake Petroules <jake.petroules@theqtcompany.com> | 2016-04-07 11:43:00 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@theqtcompany.com> | 2016-04-09 00:01:59 +0000 |
| commit | 57ecc00978115ec919d78be622c08d95f141032e (patch) | |
| tree | 89c8da697442b211babc1e9b54e5848ef08e3c1a /src/network/access | |
| parent | 01d43cece85456ae69810ea3bdaf4b0e164e1542 (diff) | |
| download | qtbase-57ecc00978115ec919d78be622c08d95f141032e.tar.gz | |
Note the introductory version of network redirection related enums.
These were missed in d815de8c26ccee33713e37a0fec2982755dcfe1f which
originally added these values.
Change-Id: I69618c90e71f7cc01eef3db477427759e62f626b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Reviewed-by: Mandeep Sandhu <mandeepsandhu.chd@gmail.com>
Diffstat (limited to 'src/network/access')
| -rw-r--r-- | src/network/access/qnetworkreply.cpp | 2 | ||||
| -rw-r--r-- | src/network/access/qnetworkrequest.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp index 26f7034c09..a7565560ac 100644 --- a/src/network/access/qnetworkreply.cpp +++ b/src/network/access/qnetworkreply.cpp @@ -135,10 +135,12 @@ QNetworkReplyPrivate::QNetworkReplyPrivate() \value TooManyRedirectsError while following redirects, the maximum limit was reached. The limit is by default set to 50 or as set by QNetworkRequest::setMaxRedirectsAllowed(). + (This value was introduced in 5.6.) \value InsecureRedirectError while following redirects, the network access API detected a redirect from a encrypted protocol (https) to an unencrypted one (http). + (This value was introduced in 5.6.) \value ProxyConnectionRefusedError the connection to the proxy server was refused (the proxy server is not accepting requests) diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index f5010198f3..2a62cb5f39 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -263,6 +263,7 @@ QT_BEGIN_NAMESPACE Indicates whether the Network Access API should automatically follow a HTTP redirect response or not. Currently redirects that are insecure, that is redirecting from "https" to "http" protocol, are not allowed. + (This value was introduced in 5.6.) \value User Special type. Additional information can be passed in |