diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-13 22:18:43 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-13 22:19:10 +0200 |
commit | 3d4aeb791990f359e277efbfb0a1f1793945b55d (patch) | |
tree | e877b7b4ad76d554aa3dbe6131d03b98a7447c63 /src/network/access/qspdyprotocolhandler.cpp | |
parent | b861c43395b17d5df34f24853faa21b9824a53af (diff) | |
parent | c8de2a8b5f5d0b9b3bc1d8ed8d3027ac40b00ee3 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/gui/kernel/qguiapplication.cpp
Change-Id: Ibe75603dc8a51769db6550ea3f07bc8d19b0be85
Diffstat (limited to 'src/network/access/qspdyprotocolhandler.cpp')
-rw-r--r-- | src/network/access/qspdyprotocolhandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/access/qspdyprotocolhandler.cpp b/src/network/access/qspdyprotocolhandler.cpp index d204d498bf..ab703981ee 100644 --- a/src/network/access/qspdyprotocolhandler.cpp +++ b/src/network/access/qspdyprotocolhandler.cpp @@ -580,7 +580,7 @@ void QSpdyProtocolHandler::sendControlFrame(FrameType type, { // frame type and stream ID char header[8]; - header[0] = 0x80; // leftmost bit == 1 -> is a control frame + header[0] = 0x80u; // leftmost bit == 1 -> is a control frame header[1] = 0x03; // 3 bit == version 3 header[2] = 0; switch (type) { @@ -653,10 +653,10 @@ void QSpdyProtocolHandler::sendSYN_STREAM(HttpMessagePair messagePair, prioAndSlot[0] = 0x00; // == prio 0 (highest) break; case QHttpNetworkRequest::NormalPriority: - prioAndSlot[0] = 0x80; // == prio 4 + prioAndSlot[0] = 0x80u; // == prio 4 break; case QHttpNetworkRequest::LowPriority: - prioAndSlot[0] = 0xe0; // == prio 7 (lowest) + prioAndSlot[0] = 0xe0u; // == prio 7 (lowest) break; } prioAndSlot[1] = 0x00; // slot in client certificates (not supported currently) |