From c9e6cdc19e44c9dc3f163bc534b1d882ee4d5101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Thu, 21 Mar 2024 16:01:01 +0100 Subject: [PATCH] QHttpNetworkConnectionPrivate: NSDMI Initialize the hardcoded things inside the class. Task-number: QTBUG-102855 Change-Id: I06da0a615ec066e63d9cd0359313e8e8f588718e Reviewed-by: Edward Welbourne --- src/network/access/qhttpnetworkconnection.cpp | 4 +--- src/network/access/qhttpnetworkconnection_p.h | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 24637e68c6..58549311ce 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -52,14 +52,12 @@ static int getPreferredActiveChannelCount(QHttpNetworkConnection::ConnectionType QHttpNetworkConnectionPrivate::QHttpNetworkConnectionPrivate(quint16 connectionCount, const QString &hostName, quint16 port, bool encrypt, QHttpNetworkConnection::ConnectionType type) -: state(RunningState), networkLayerState(Unknown), - hostName(hostName), port(port), encrypt(encrypt), delayIpv4(true), +: hostName(hostName), port(port), encrypt(encrypt), activeChannelCount(getPreferredActiveChannelCount(type, connectionCount)), channelCount(connectionCount), channels(new QHttpNetworkConnectionChannel[channelCount]) #ifndef QT_NO_NETWORKPROXY , networkProxy(QNetworkProxy::NoProxy) #endif - , preConnectRequests(0) , connectionType(type) { // We allocate all 6 channels even if it's an HTTP/2-enabled diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h index b31327dcc2..b067b7d252 100644 --- a/src/network/access/qhttpnetworkconnection_p.h +++ b/src/network/access/qhttpnetworkconnection_p.h @@ -160,8 +160,8 @@ public: void pauseConnection(); void resumeConnection(); - ConnectionState state; - NetworkLayerPreferenceState networkLayerState; + ConnectionState state = RunningState; + NetworkLayerPreferenceState networkLayerState = Unknown; enum { ChunkSize = 4096 }; @@ -204,7 +204,7 @@ public: QString hostName; quint16 port; bool encrypt; - bool delayIpv4; + bool delayIpv4 = true; // Number of channels we are trying to use at the moment: int activeChannelCount; @@ -237,7 +237,7 @@ public: QList highPriorityQueue; QList lowPriorityQueue; - int preConnectRequests; + int preConnectRequests = 0; QHttpNetworkConnection::ConnectionType connectionType;