diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-22 11:30:00 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-22 11:30:01 +0200 |
| commit | d314819fc02139e05e16c56657898c704f7fb48f (patch) | |
| tree | a61ba968233634948401c8339f9613844de1c2b5 /src/network/access/qhttp2protocolhandler_p.h | |
| parent | 9f888d2fde9c5413e5519e0914e9b13638760985 (diff) | |
| parent | e0e9e196a72ffe5457034894eaaadc90ed0d34ef (diff) | |
| download | qtbase-d314819fc02139e05e16c56657898c704f7fb48f.tar.gz | |
Merge dev into 5.8
Change-Id: I41ee7b50534b01cf042bed8bb8824ba2e5026a29
Diffstat (limited to 'src/network/access/qhttp2protocolhandler_p.h')
| -rw-r--r-- | src/network/access/qhttp2protocolhandler_p.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/network/access/qhttp2protocolhandler_p.h b/src/network/access/qhttp2protocolhandler_p.h index b146e37dd3..92c6851078 100644 --- a/src/network/access/qhttp2protocolhandler_p.h +++ b/src/network/access/qhttp2protocolhandler_p.h @@ -55,7 +55,7 @@ #include <private/qabstractprotocolhandler_p.h> #include <private/qhttpnetworkrequest_p.h> -#if !defined(QT_NO_HTTP) && !defined(QT_NO_SSL) +#if !defined(QT_NO_HTTP) #include "http2/http2protocol_p.h" #include "http2/http2streams_p.h" @@ -124,7 +124,7 @@ private: bool acceptSetting(Http2::Settings identifier, quint32 newValue); void updateStream(Stream &stream, const HPack::HttpHeader &headers); - void updateStream(Stream &stream, const Http2::FrameReader &dataFrame); + void updateStream(Stream &stream, const Http2::Frame &dataFrame); void finishStream(Stream &stream); // Error code send by a peer (GOAWAY/RST_STREAM): void finishStreamWithError(Stream &stream, quint32 errorCode); @@ -161,12 +161,13 @@ private: // Peer's max frame size. quint32 maxFrameSize = Http2::maxFrameSize; - Http2::FrameReader inboundFrame; - Http2::FrameWriter outboundFrame; + Http2::FrameReader frameReader; + Http2::Frame inboundFrame; + Http2::FrameWriter frameWriter; // Temporary storage to assemble HEADERS' block // from several CONTINUATION frames ... bool continuationExpected = false; - std::vector<Http2::FrameReader> continuedFrames; + std::vector<Http2::Frame> continuedFrames; // Peer's max number of streams ... quint32 maxConcurrentStreams = Http2::maxConcurrentStreams; @@ -202,6 +203,6 @@ private: QT_END_NAMESPACE -#endif // !defined(QT_NO_HTTP) && !defined(QT_NO_SSL) +#endif // !defined(QT_NO_HTTP) #endif |