diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-07 19:10:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-07 19:10:53 +0200 |
| commit | 096e37910d93f9c52976600e985c615ea36fe291 (patch) | |
| tree | 713d020f4a04f03d8ca6e111055e7eebe85953a8 /src/network | |
| parent | 88eda007a3b5046999dd0b287634765efcd8934d (diff) | |
| parent | a14a943f9ac3d1e85514d7fb6688c84e624ac850 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
src/corelib/kernel/qeventdispatcher_cf.mm
src/gui/kernel/qguiapplication_p.h
src/gui/kernel/qwindowsysteminterface.cpp
src/gui/kernel/qwindowsysteminterface.h
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/cocoa/qnswindowdelegate.mm
src/plugins/platforms/ios/qioseventdispatcher.mm
src/plugins/platforms/windows/qwindowsdrag.h
src/plugins/platforms/windows/qwindowsinternalmimedata.h
src/plugins/platforms/windows/qwindowsmime.cpp
src/plugins/platforms/winrt/qwinrtscreen.cpp
Change-Id: Ic817f265c2386e83839d2bb9ef7419cb29705246
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/http2/hpacktable.cpp | 2 | ||||
| -rw-r--r-- | src/network/kernel/qhostaddress.cpp | 2 | ||||
| -rw-r--r-- | src/network/ssl/qsslconfiguration.cpp | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/network/access/http2/hpacktable.cpp b/src/network/access/http2/hpacktable.cpp index db9574e2bc..a90ee72d52 100644 --- a/src/network/access/http2/hpacktable.cpp +++ b/src/network/access/http2/hpacktable.cpp @@ -64,8 +64,6 @@ HeaderSize entry_size(const QByteArray &name, const QByteArray &value) const unsigned sum = unsigned(name.size()) + value.size(); if (std::numeric_limits<unsigned>::max() - 32 < sum) return HeaderSize(); - if (sum + 32 > std::numeric_limits<quint32>::max()) - return HeaderSize(); return HeaderSize(true, quint32(sum + 32)); } diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp index 63056a525b..27b5f570dc 100644 --- a/src/network/kernel/qhostaddress.cpp +++ b/src/network/kernel/qhostaddress.cpp @@ -260,7 +260,7 @@ bool QNetmask::setAddress(const QHostAddress &address) int netmask = 0; quint8 *ptr = ip.v6; quint8 *end; - length = -1; + length = 255; if (address.protocol() == QAbstractSocket::IPv4Protocol) { ip.v4 = qToBigEndian(address.toIPv4Address()); diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp index 290a7898f5..e03b89f58e 100644 --- a/src/network/ssl/qsslconfiguration.cpp +++ b/src/network/ssl/qsslconfiguration.cpp @@ -1026,7 +1026,7 @@ void QSslConfiguration::setDtlsCookieVerificationEnabled(bool enable) \list \li no local certificate and no private key - \li protocol SecureProtocols (meaning either TLS 1.0 or SSL 3 will be used) + \li protocol \l{QSsl::SecureProtocols}{SecureProtocols} \li the system's default CA certificate list \li the cipher list equal to the list of the SSL libraries' supported SSL ciphers that are 128 bits or more |