diff options
| author | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-08-04 09:34:50 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-08-04 10:21:24 +0000 |
| commit | 2d1f1371733c85b23eb91d27999c5a0ec9373a54 (patch) | |
| tree | 0789ab06c9d0ec125b7e989109a8a163982970a6 /src/network/access/qhttpthreaddelegate.cpp | |
| parent | 4a40c717f3cf1ae181df49c91261a12d5e33e5a4 (diff) | |
Revert "Implement protocol upgrade for HTTP/2 enabled requests"
This reverts commit 12d71f4ea20415ff2274e1e90f9e4d5a8b935d7f.
This change is breaking a build + incomplete as my test revealed.
Will have to re-try later.
Change-Id: I7ea089093a832aa5822caaaac56e62f5fda4df17
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/network/access/qhttpthreaddelegate.cpp')
| -rw-r--r-- | src/network/access/qhttpthreaddelegate.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp index 8b200ebc04..e16519c2f2 100644 --- a/src/network/access/qhttpthreaddelegate.cpp +++ b/src/network/access/qhttpthreaddelegate.cpp @@ -286,12 +286,9 @@ void QHttpThreadDelegate::startRequest() QHttpNetworkConnection::ConnectionType connectionType = QHttpNetworkConnection::ConnectionTypeHTTP; - - if (httpRequest.isHTTP2Allowed()) - connectionType = QHttpNetworkConnection::ConnectionTypeHTTP2; - #ifndef QT_NO_SSL if (httpRequest.isHTTP2Allowed() && ssl) { + connectionType = QHttpNetworkConnection::ConnectionTypeHTTP2; QList<QByteArray> protocols; protocols << QSslConfiguration::ALPNProtocolHTTP2 << QSslConfiguration::NextProtocolHttp1_1; |