diff options
author | Mårten Nordheim <marten.nordheim@qt.io> | 2024-01-31 09:56:52 +0100 |
---|---|---|
committer | Mårten Nordheim <marten.nordheim@qt.io> | 2024-01-31 10:57:04 +0100 |
commit | 62b2095c5757ffd46d517991539304508011e155 (patch) | |
tree | 62072fb0c1b3b53e1e73d1dd4d235f8ddb9a530c | |
parent | b203220ae99ffa96815665c32c9955d8fedcd6fc (diff) |
Update QtNetworkAuth tests for new QHttpHeaders behavior
Since we now send the headers in lower-case we also need to be prepared
for them to be lower-case on the server-side here.
Fixes: QTBUG-121727
Change-Id: I83b52277842b2c88b65fe13071123d223ccc6e19
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
-rw-r--r-- | tests/auto/oauth1/tst_oauth1.cpp | 2 | ||||
-rw-r--r-- | tests/auto/shared/webserver.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/oauth1/tst_oauth1.cpp b/tests/auto/oauth1/tst_oauth1.cpp index 4028a32..4313a9b 100644 --- a/tests/auto/oauth1/tst_oauth1.cpp +++ b/tests/auto/oauth1/tst_oauth1.cpp @@ -405,7 +405,7 @@ void tst_OAuth1::getToken() QMultiMap<QString, QVariant> oauthHeaders; WebServer webServer([&](const WebServer::HttpRequest &request, QTcpSocket *socket) { - oauthHeaders = parseAuthorizationString(request.headers["Authorization"]); + oauthHeaders = parseAuthorizationString(request.headers["authorization"]); const QString format = "oauth_token=%1&oauth_token_secret=%2"; const QByteArray text = format.arg(expectedToken.first, expectedToken.second).toUtf8(); const QByteArray replyMessage { diff --git a/tests/auto/shared/webserver.h b/tests/auto/shared/webserver.h index 238a4eb..2f74fcb 100644 --- a/tests/auto/shared/webserver.h +++ b/tests/auto/shared/webserver.h @@ -103,8 +103,8 @@ WebServer::WebServer(Handler h, QObject *parent) : clients.remove(socket); } else if (Q_LIKELY(request->state == HttpRequest::State::AllDone)) { Q_ASSERT(handler); - if (request->headers.contains("Host")) { - const auto parts = request->headers["Host"].split(':'); + if (request->headers.contains("host")) { + const auto parts = request->headers["host"].split(':'); request->url.setHost(parts.at(0)); if (parts.size() == 2) request->url.setPort(parts.at(1).toUInt()); @@ -229,7 +229,7 @@ bool WebServer::HttpRequest::readHeaders(QTcpSocket *socket) const QByteArray key = fragment.mid(0, index).trimmed(); const QByteArray value = fragment.mid(index + 1).trimmed(); - headers.insert(key, value); + headers.insert(key.toLower(), value); fragment.clear(); } } @@ -239,9 +239,9 @@ bool WebServer::HttpRequest::readHeaders(QTcpSocket *socket) bool WebServer::HttpRequest::readBody(QTcpSocket *socket) { - if (headers.contains("Content-Length")) { + if (headers.contains("content-length")) { bool conversionResult; - bytesLeft = headers["Content-Length"].toInt(&conversionResult); + bytesLeft = headers["content-length"].toInt(&conversionResult); if (Q_UNLIKELY(!conversionResult)) return false; fragment.resize(bytesLeft); |