diff options
| author | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-01-12 14:45:47 +0100 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-07-08 16:22:32 +0000 |
| commit | b2c0f9713c1c39bc3214df49f0d2b44bcc84d790 (patch) | |
| tree | 6a8eee65f90dd67968fd239606354d49f2202342 /src/network/access/qhttpnetworkconnection.cpp | |
| parent | 6f61cfc33810054173a17443b20bfa2dce737285 (diff) | |
HTTP2 protocol handler
Add HTTP2 support in QNAM - QHttp2ProtocolHandler + aux. classes.
[ChangeLog][QtNetwork] Added support for HTTP/2 protocol
Task-number: QTBUG-50956
Change-Id: I3a119cfbb1fb3118d9003225f5e54b46ae2829b6
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/network/access/qhttpnetworkconnection.cpp')
| -rw-r--r-- | src/network/access/qhttpnetworkconnection.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 79f418f675..e62d662b52 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -82,7 +82,8 @@ QHttpNetworkConnectionPrivate::QHttpNetworkConnectionPrivate(const QString &host networkLayerState(Unknown), hostName(hostName), port(port), encrypt(encrypt), delayIpv4(true) #ifndef QT_NO_SSL -, channelCount((type == QHttpNetworkConnection::ConnectionTypeSPDY) ? 1 : defaultHttpChannelCount) +, channelCount((type == QHttpNetworkConnection::ConnectionTypeSPDY || type == QHttpNetworkConnection::ConnectionTypeHTTP2) + ? 1 : defaultHttpChannelCount) #else , channelCount(defaultHttpChannelCount) #endif // QT_NO_SSL @@ -1011,7 +1012,8 @@ void QHttpNetworkConnectionPrivate::_q_startNextRequest() } break; } - case QHttpNetworkConnection::ConnectionTypeSPDY: { + case QHttpNetworkConnection::ConnectionTypeSPDY: + case QHttpNetworkConnection::ConnectionTypeHTTP2: { #ifndef QT_NO_SSL if (channels[0].spdyRequestsToSend.isEmpty()) return; |