1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Http2: Fix 'Received' typo

Browse Source 
Missing 'e'.

QHttp2Connection is private API so the API can be changed.
No known external users.

Pick-to: 6.8
Change-Id: I4f3daab9deff3250ff66066dc3e088edfbbfc5ef
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Matthias Rauter <matthias.rauter@qt.io>
Reviewed-by: Mate Barany <mate.barany@qt.io>
(cherry picked from commit 70d3293d72a1a612d375447a6f46ea223be1f9cd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mårten Nordheim 2025-04-29 12:40:56 +02:00 committed by Qt Cherry-pick Bot
parent a692c8a78d
commit ee9ee08762
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/network/access/qhttp2connection.cpp
View File

@ -1539,7 +1539,7 @@ void QHttp2Connection::handleRST_STREAM()
const auto error = qFromBigEndian<quint32>(inboundFrame.dataBegin()); const auto error = qFromBigEndian<quint32>(inboundFrame.dataBegin());
if (QPointer<QHttp2Stream> stream = m_streams[streamID]) if (QPointer<QHttp2Stream> stream = m_streams[streamID])
emit stream->rstFrameRecived(error); emit stream->rstFrameReceived(error);
// Verify that whatever stream is being RST'd is not in the idle state: // Verify that whatever stream is being RST'd is not in the idle state:
const quint32 lastRelevantStreamID = [this, streamID]() { const quint32 lastRelevantStreamID = [this, streamID]() {
@ -1717,18 +1717,18 @@ void QHttp2Connection::handlePING()
if (inboundFrame.flags() & FrameFlag::ACK) { if (inboundFrame.flags() & FrameFlag::ACK) {
QByteArrayView pingSignature(reinterpret_cast<const char *>(inboundFrame.dataBegin()), 8); QByteArrayView pingSignature(reinterpret_cast<const char *>(inboundFrame.dataBegin()), 8);
if (!m_lastPingSignature.has_value()) { if (!m_lastPingSignature.has_value()) {
emit pingFrameRecived(PingState::PongNoPingSent); emit pingFrameReceived(PingState::PongNoPingSent);
qCWarning(qHttp2ConnectionLog, "[%p] PING with ACK received but no PING was sent.", this); qCWarning(qHttp2ConnectionLog, "[%p] PING with ACK received but no PING was sent.", this);
} else if (pingSignature != m_lastPingSignature) { } else if (pingSignature != m_lastPingSignature) {
emit pingFrameRecived(PingState::PongSignatureChanged); emit pingFrameReceived(PingState::PongSignatureChanged);
qCWarning(qHttp2ConnectionLog, "[%p] PING signature does not match the last PING.", this); qCWarning(qHttp2ConnectionLog, "[%p] PING signature does not match the last PING.", this);
} else { } else {
emit pingFrameRecived(PingState::PongSignatureIdentical); emit pingFrameReceived(PingState::PongSignatureIdentical);
} }
m_lastPingSignature.reset(); m_lastPingSignature.reset();
return; return;
} else { } else {
emit pingFrameRecived(PingState::Ping); emit pingFrameReceived(PingState::Ping);
} }

4
src/network/access/qhttp2connection_p.h
View File

@ -131,7 +131,7 @@ Q_SIGNALS:
void promisedStreamReceived(quint32 newStreamID); void promisedStreamReceived(quint32 newStreamID);
void uploadBlocked(); void uploadBlocked();
void dataReceived(const QByteArray &data, bool endStream); void dataReceived(const QByteArray &data, bool endStream);
void rstFrameRecived(quint32 errorCode); void rstFrameReceived(quint32 errorCode);
void bytesWritten(qint64 bytesWritten); void bytesWritten(qint64 bytesWritten);
void uploadDeviceError(const QString &errorString); void uploadDeviceError(const QString &errorString);
@ -261,7 +261,7 @@ Q_SIGNALS:
void errorReceived(/*@future: add as needed?*/); // Connection errors only, no stream-specific errors void errorReceived(/*@future: add as needed?*/); // Connection errors only, no stream-specific errors
void connectionClosed(); void connectionClosed();
void settingsFrameReceived(); void settingsFrameReceived();
void pingFrameRecived(QHttp2Connection::PingState state); void pingFrameReceived(QHttp2Connection::PingState state);
void errorOccurred(Http2::Http2Error errorCode, const QString &errorString); void errorOccurred(Http2::Http2Error errorCode, const QString &errorString);
void receivedGOAWAY(Http2::Http2Error errorCode, quint32 lastStreamID); void receivedGOAWAY(Http2::Http2Error errorCode, quint32 lastStreamID);
void receivedEND_STREAM(quint32 streamID); void receivedEND_STREAM(quint32 streamID);

24
tests/auto/network/access/qhttp2connection/tst_qhttp2connection.cpp
View File

@ -382,8 +382,8 @@ void tst_QHttp2Connection::testPING()
QVERIFY(clientStream); QVERIFY(clientStream);
QVERIFY(waitForSettingsExchange(connection, serverConnection)); QVERIFY(waitForSettingsExchange(connection, serverConnection));
QSignalSpy serverPingSpy{ serverConnection, &QHttp2Connection::pingFrameRecived }; QSignalSpy serverPingSpy{ serverConnection, &QHttp2Connection::pingFrameReceived };
QSignalSpy clientPingSpy{ connection, &QHttp2Connection::pingFrameRecived }; QSignalSpy clientPingSpy{ connection, &QHttp2Connection::pingFrameReceived };
QByteArray data{"pingpong"}; QByteArray data{"pingpong"};
connection->sendPing(data); connection->sendPing(data);
@ -424,8 +424,8 @@ void tst_QHttp2Connection::testRSTServerSide()
auto *serverStream = newIncomingStreamSpy.front().front().value<QHttp2Stream *>(); auto *serverStream = newIncomingStreamSpy.front().front().value<QHttp2Stream *>();
QCOMPARE(clientStream->streamID(), serverStream->streamID()); QCOMPARE(clientStream->streamID(), serverStream->streamID());
QSignalSpy rstClientSpy{ clientStream, &QHttp2Stream::rstFrameRecived }; QSignalSpy rstClientSpy{ clientStream, &QHttp2Stream::rstFrameReceived };
QSignalSpy rstServerSpy{ serverStream, &QHttp2Stream::rstFrameRecived }; QSignalSpy rstServerSpy{ serverStream, &QHttp2Stream::rstFrameReceived };
QCOMPARE(clientStream->state(), QHttp2Stream::State::Open); QCOMPARE(clientStream->state(), QHttp2Stream::State::Open);
QCOMPARE(serverStream->state(), QHttp2Stream::State::Open); QCOMPARE(serverStream->state(), QHttp2Stream::State::Open);
@ -457,8 +457,8 @@ void tst_QHttp2Connection::testRSTClientSide()
auto *serverStream = newIncomingStreamSpy.front().front().value<QHttp2Stream *>(); auto *serverStream = newIncomingStreamSpy.front().front().value<QHttp2Stream *>();
QCOMPARE(clientStream->streamID(), serverStream->streamID()); QCOMPARE(clientStream->streamID(), serverStream->streamID());
QSignalSpy rstClientSpy{ clientStream, &QHttp2Stream::rstFrameRecived }; QSignalSpy rstClientSpy{ clientStream, &QHttp2Stream::rstFrameReceived };
QSignalSpy rstServerSpy{ serverStream, &QHttp2Stream::rstFrameRecived }; QSignalSpy rstServerSpy{ serverStream, &QHttp2Stream::rstFrameReceived };
QCOMPARE(clientStream->state(), QHttp2Stream::State::Open); QCOMPARE(clientStream->state(), QHttp2Stream::State::Open);
QCOMPARE(serverStream->state(), QHttp2Stream::State::Open); QCOMPARE(serverStream->state(), QHttp2Stream::State::Open);
@ -490,8 +490,8 @@ void tst_QHttp2Connection::testRSTReplyOnDATAEND()
auto *serverStream = newIncomingStreamSpy.front().front().value<QHttp2Stream *>(); auto *serverStream = newIncomingStreamSpy.front().front().value<QHttp2Stream *>();
QCOMPARE(clientStream->streamID(), serverStream->streamID()); QCOMPARE(clientStream->streamID(), serverStream->streamID());
QSignalSpy rstClientSpy{ clientStream, &QHttp2Stream::rstFrameRecived }; QSignalSpy rstClientSpy{ clientStream, &QHttp2Stream::rstFrameReceived };
QSignalSpy rstServerSpy{ serverStream, &QHttp2Stream::rstFrameRecived }; QSignalSpy rstServerSpy{ serverStream, &QHttp2Stream::rstFrameReceived };
QSignalSpy endServerSpy{ serverConnection, &QHttp2Connection::receivedEND_STREAM }; QSignalSpy endServerSpy{ serverConnection, &QHttp2Connection::receivedEND_STREAM };
QSignalSpy errrorServerSpy{ serverStream, &QHttp2Stream::errorOccurred }; QSignalSpy errrorServerSpy{ serverStream, &QHttp2Stream::errorOccurred };
@ -602,8 +602,8 @@ void tst_QHttp2Connection::testBadFrameSize()
auto *serverStream = newIncomingStreamSpy.front().front().value<QHttp2Stream *>(); auto *serverStream = newIncomingStreamSpy.front().front().value<QHttp2Stream *>();
QCOMPARE(clientStream->streamID(), serverStream->streamID()); QCOMPARE(clientStream->streamID(), serverStream->streamID());
QSignalSpy rstClientSpy{ clientStream, &QHttp2Stream::rstFrameRecived }; QSignalSpy rstClientSpy{ clientStream, &QHttp2Stream::rstFrameReceived };
QSignalSpy rstServerSpy{ serverStream, &QHttp2Stream::rstFrameRecived }; QSignalSpy rstServerSpy{ serverStream, &QHttp2Stream::rstFrameReceived };
QSignalSpy goawayClientSpy{ connection, &QHttp2Connection::receivedGOAWAY }; QSignalSpy goawayClientSpy{ connection, &QHttp2Connection::receivedGOAWAY };
QSignalSpy goawayServerSpy{ serverConnection, &QHttp2Connection::receivedGOAWAY }; QSignalSpy goawayServerSpy{ serverConnection, &QHttp2Connection::receivedGOAWAY };
@ -663,7 +663,7 @@ void tst_QHttp2Connection::testDataFrameAfterRSTIncoming()
auto *serverStream = newIncomingStreamSpy.front().front().value<QHttp2Stream *>(); auto *serverStream = newIncomingStreamSpy.front().front().value<QHttp2Stream *>();
QCOMPARE(clientStream->streamID(), serverStream->streamID()); QCOMPARE(clientStream->streamID(), serverStream->streamID());
QSignalSpy rstServerSpy{ serverStream, &QHttp2Stream::rstFrameRecived }; QSignalSpy rstServerSpy{ serverStream, &QHttp2Stream::rstFrameReceived };
QCOMPARE(clientStream->state(), QHttp2Stream::State::Open); QCOMPARE(clientStream->state(), QHttp2Stream::State::Open);
QCOMPARE(serverStream->state(), QHttp2Stream::State::Open); QCOMPARE(serverStream->state(), QHttp2Stream::State::Open);
@ -705,7 +705,7 @@ void tst_QHttp2Connection::testDataFrameAfterRSTOutgoing()
auto *serverStream = newIncomingStreamSpy.front().front().value<QHttp2Stream *>(); auto *serverStream = newIncomingStreamSpy.front().front().value<QHttp2Stream *>();
QCOMPARE(clientStream->streamID(), serverStream->streamID()); QCOMPARE(clientStream->streamID(), serverStream->streamID());
QSignalSpy rstServerSpy{ serverStream, &QHttp2Stream::rstFrameRecived }; QSignalSpy rstServerSpy{ serverStream, &QHttp2Stream::rstFrameReceived };
QCOMPARE(clientStream->state(), QHttp2Stream::State::Open); QCOMPARE(clientStream->state(), QHttp2Stream::State::Open);
QCOMPARE(serverStream->state(), QHttp2Stream::State::Open); QCOMPARE(serverStream->state(), QHttp2Stream::State::Open);