1 files changed, 9 insertions, 7 deletions
diff --git a/tests/auto/network/access/http2/http2srv.h b/tests/auto/network/access/http2/http2srv.h
index 00cfde944b..73b1d80f8e 100644..100755
--- a/tests/auto/network/access/http2/http2srv.h
+++ b/tests/auto/network/access/http2/http2srv.h
@@ -33,9 +33,9 @@
 #include <QtNetwork/private/http2frames_p.h>
 #include <QtNetwork/private/hpack_p.h>
 
+#include <QtNetwork/qabstractsocket.h>
 #include <QtCore/qscopedpointer.h>
 #include <QtNetwork/qtcpserver.h>
-#include <QtNetwork/qsslsocket.h>
 #include <QtCore/qbytearray.h>
 #include <QtCore/qglobal.h>
 
@@ -62,7 +62,7 @@ class Http2Server : public QTcpServer
 {
     Q_OBJECT
 public:
-    Http2Server(const Http2Settings &serverSettings,
+    Http2Server(bool clearText, const Http2Settings &serverSettings,
                 const Http2Settings &clientSettings);
 
     ~Http2Server();
@@ -105,7 +105,7 @@ Q_SIGNALS:
     void windowUpdate(quint32 streamID);
 
 private slots:
-    void connectionEncrypted();
+    void connectionEstablished();
     void readReady();
 
 private:
@@ -113,7 +113,7 @@ private:
 
     quint32 clientSetting(Http2::Settings identifier, quint32 defaultValue);
 
-    QScopedPointer<QSslSocket> socket;
+    QScopedPointer<QAbstractSocket> socket;
 
     // Connection preface:
     bool waitingClientPreface = false;
@@ -126,10 +126,11 @@ private:
 
     bool connectionError = false;
 
-    Http2::FrameReader inboundFrame;
-    Http2::FrameWriter outboundFrame;
+    Http2::FrameReader reader;
+    Http2::Frame inboundFrame;
+    Http2::FrameWriter writer;
 
-    using FrameSequence = std::vector<Http2::FrameReader>;
+    using FrameSequence = std::vector<Http2::Frame>;
     FrameSequence continuedRequest;
 
     std::map<quint32, quint32> streamWindows;
@@ -155,6 +156,7 @@ private:
     quint32 streamRecvWindowSize = Http2::defaultSessionWindowSize;
 
     QByteArray responseBody;
+    bool clearTextHTTP2 = false;
 
 protected slots:
     void ignoreErrorSlot();