diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-24 16:27:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-05-24 16:29:14 +0200 |
| commit | f82e5085169876e0ec7c1b744d021b068c281cfe (patch) | |
| tree | a870e1f68ce62818a0793c4c78a67971e841e676 /src/network | |
| parent | f74d4fb1dacc682e2e6f4a44e4240f642a2c3b70 (diff) | |
| parent | ee47999333dde1d38b73d04e142e05f06f8c56ed (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
mkspecs/features/qt_common.prf
src/corelib/tools/qstring.cpp
src/plugins/platforms/windows/qwindowsmousehandler.cpp
src/widgets/widgets/qmainwindowlayout_p.h
Change-Id: I5df613008f6336f69b257d08e49a133d033a9d65
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qhttp2protocolhandler.cpp | 1 | ||||
| -rw-r--r-- | src/network/access/qnetworkrequest.cpp | 3 | ||||
| -rw-r--r-- | src/network/kernel/qnetworkinterface_linux.cpp | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/network/access/qhttp2protocolhandler.cpp b/src/network/access/qhttp2protocolhandler.cpp index 22541e83ba..c207d6e240 100644 --- a/src/network/access/qhttp2protocolhandler.cpp +++ b/src/network/access/qhttp2protocolhandler.cpp @@ -1150,7 +1150,6 @@ void QHttp2ProtocolHandler::updateStream(Stream &stream, const Frame &frame, auto &httpRequest = stream.request(); auto replyPrivate = httpReply->d_func(); - replyPrivate->compressedData.append(data, length); replyPrivate->totalProgress += length; const QByteArray wrapped(data, length); diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index 2d6df9de21..70a7f4e8bd 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -924,6 +924,8 @@ static int parseHeaderName(const QByteArray &headerName) return QNetworkRequest::ContentLengthHeader; else if (qstricmp(headerName.constData(), "cookie") == 0) return QNetworkRequest::CookieHeader; + else if (qstricmp(headerName.constData(), "content-disposition") == 0) + return QNetworkRequest::ContentDispositionHeader; break; case 'e': @@ -1048,6 +1050,7 @@ static QVariant parseHeaderValue(QNetworkRequest::KnownHeaders header, const QBy case QNetworkRequest::UserAgentHeader: case QNetworkRequest::ServerHeader: case QNetworkRequest::ContentTypeHeader: + case QNetworkRequest::ContentDispositionHeader: // copy exactly, convert to QString return QString::fromLatin1(value); diff --git a/src/network/kernel/qnetworkinterface_linux.cpp b/src/network/kernel/qnetworkinterface_linux.cpp index 23ed2e0e15..b3b5e242b4 100644 --- a/src/network/kernel/qnetworkinterface_linux.cpp +++ b/src/network/kernel/qnetworkinterface_linux.cpp @@ -169,7 +169,7 @@ template <typename Lambda> struct ProcessNetlinkRequest forever { qsizetype len = recv(sock, buf, bufsize, 0); hdr = reinterpret_cast<struct nlmsghdr *>(buf); - if (!NLMSG_OK(hdr, len)) + if (!NLMSG_OK(hdr, quint32(len))) return; auto arg = reinterpret_cast<FirstArgument>(NLMSG_DATA(hdr)); @@ -194,7 +194,7 @@ template <typename Lambda> struct ProcessNetlinkRequest hdr = NLMSG_NEXT(hdr, len); arg = reinterpret_cast<FirstArgument>(NLMSG_DATA(hdr)); payloadLen = NLMSG_PAYLOAD(hdr, 0); - } while (NLMSG_OK(hdr, len)); + } while (NLMSG_OK(hdr, quint32(len))); if (len == 0) continue; // get new datagram |