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/qhttp2protocolhandler_p.h | |
| 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/qhttp2protocolhandler_p.h')
| -rw-r--r-- | src/network/access/qhttp2protocolhandler_p.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/network/access/qhttp2protocolhandler_p.h b/src/network/access/qhttp2protocolhandler_p.h index e41b1360bf..b146e37dd3 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) +#if !defined(QT_NO_HTTP) && !defined(QT_NO_SSL) #include "http2/http2protocol_p.h" #include "http2/http2streams_p.h" @@ -81,15 +81,7 @@ class QHttp2ProtocolHandler : public QObject, public QAbstractProtocolHandler Q_OBJECT public: - // "TLS + ALPN/NPN" case: QHttp2ProtocolHandler(QHttpNetworkConnectionChannel *channel); - // HTTP2 without TLS - the first request was sent as an HTTP/1.1 request - // with Upgrade:h2c header. That serves as an implicit HTTP/2 request - // on a stream with ID 1 (it will be created in this ctor in a - // 'half-closed-local' state); reply, if server supports HTTP/2, - // will be HTTP/2 frame(s): - QHttp2ProtocolHandler(QHttpNetworkConnectionChannel *channel, - const HttpMessagePair &message); QHttp2ProtocolHandler(const QHttp2ProtocolHandler &rhs) = delete; QHttp2ProtocolHandler(QHttp2ProtocolHandler &&rhs) = delete; @@ -141,7 +133,7 @@ private: const QString &message); // Stream's lifecycle management: - quint32 createNewStream(const HttpMessagePair &message, bool uploadData); + quint32 createNewStream(const HttpMessagePair &message); void addToSuspended(Stream &stream); void markAsReset(quint32 streamID); quint32 popStreamToResume(); @@ -210,6 +202,6 @@ private: QT_END_NAMESPACE -#endif // !defined(QT_NO_HTTP) +#endif // !defined(QT_NO_HTTP) && !defined(QT_NO_SSL) #endif |