diff options
author | Liang Qi <liang.qi@qt.io> | 2017-05-07 13:07:34 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-05-07 13:08:18 +0200 |
commit | d1ea4813458b383e66ce4df69d1833b8b6a279c4 (patch) | |
tree | 3bdc16da993e5de56b669e6774fb0748075ddd90 /src/network | |
parent | 1c87d4e1a1d0e1972f6dc85e55ea9be8a42797ba (diff) | |
parent | 0b1ec78c2d4871afcc89d5b046926b88f0819a7c (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/network/access/qnetworkreply.cpp
tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
Change-Id: Iadf766269454087e69fb216fc3857d85b0ddfaad
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/access/qnetworkreply.cpp | 2 | ||||
-rw-r--r-- | src/network/configure.json | 2 | ||||
-rw-r--r-- | src/network/socket/socket.pri | 11 | ||||
-rw-r--r-- | src/network/ssl/qsslsocket_mac.cpp | 3 |
4 files changed, 13 insertions, 5 deletions
diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp index cce6ed264e..8671086351 100644 --- a/src/network/access/qnetworkreply.cpp +++ b/src/network/access/qnetworkreply.cpp @@ -313,7 +313,7 @@ QNetworkReplyPrivate::QNetworkReplyPrivate() to network requests whose redirects policy is set to QNetworkRequest::UserVerifiedRedirectPolicy - \sa QNetworkRequest::UserVerifiedRedirectPolicy + \sa QNetworkRequest::UserVerifiedRedirectPolicy, QNetworkAccessManager::setRedirectsPolicy(), QNetworkRequest::RedirectsPolicyAttribute */ diff --git a/src/network/configure.json b/src/network/configure.json index 7bd3f6164a..d35dda99bc 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -212,7 +212,7 @@ "label": "SOCKS5", "purpose": "Provides SOCKS5 support in QNetworkProxy.", "section": "Networking", - "condition": "!config.winrt", + "condition": "!config.winrt && features.networkproxy", "output": [ "publicFeature", "feature" ] }, "networkinterface": { diff --git a/src/network/socket/socket.pri b/src/network/socket/socket.pri index 793ea60b07..18a8153f56 100644 --- a/src/network/socket/socket.pri +++ b/src/network/socket/socket.pri @@ -2,7 +2,6 @@ HEADERS += socket/qabstractsocketengine_p.h \ socket/qhttpsocketengine_p.h \ - socket/qsocks5socketengine_p.h \ socket/qabstractsocket.h \ socket/qabstractsocket_p.h \ socket/qtcpsocket.h \ @@ -17,7 +16,6 @@ HEADERS += socket/qabstractsocketengine_p.h \ SOURCES += socket/qabstractsocketengine.cpp \ socket/qhttpsocketengine.cpp \ - socket/qsocks5socketengine.cpp \ socket/qabstractsocket.cpp \ socket/qtcpsocket.cpp \ socket/qudpsocket.cpp \ @@ -25,6 +23,15 @@ SOURCES += socket/qabstractsocketengine.cpp \ socket/qlocalsocket.cpp \ socket/qlocalserver.cpp +# SOCK5 support. + +qtConfig(socks5) { + HEADERS += \ + socket/qsocks5socketengine_p.h + SOURCES += \ + socket/qsocks5socketengine.cpp +} + # SCTP support. qtConfig(sctp) { diff --git a/src/network/ssl/qsslsocket_mac.cpp b/src/network/ssl/qsslsocket_mac.cpp index 534467fb82..0456b7cdc7 100644 --- a/src/network/ssl/qsslsocket_mac.cpp +++ b/src/network/ssl/qsslsocket_mac.cpp @@ -1227,7 +1227,8 @@ bool QSslSocketBackendPrivate::verifyPeerTrust() CFArrayAppendValue(certArray, certRef); } SecTrustSetAnchorCertificates(trust, certArray); - SecTrustSetAnchorCertificatesOnly(trust, false); + // Secure Transport should use anchors only from our QSslConfiguration: + SecTrustSetAnchorCertificatesOnly(trust, true); SecTrustResultType trustResult = kSecTrustResultInvalid; SecTrustEvaluate(trust, &trustResult); |