diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-11-02 12:01:54 +0100 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-11-02 13:05:12 +0100 |
| commit | bc11ea9a013e73f01cb715d5fdee07767f908c4f (patch) | |
| tree | 3e406677a1bd4e1d1089b51e6268a8697af504a6 /src/oauth/qoauthhttpserverreplyhandler.cpp | |
| parent | de9960739884c33d4ba1604b5f12bc2ad4da98b1 (diff) | |
Http reply handler: various clean-up
Just various changes I noticed could be made while I was looking into a
bugreport.
The socket->read(1) creates a QByteArray each time, let's just read
one char.
Use QByteArray::number instead of QString::number().toUtf8
Change-Id: I0c508fee0c350a76fc9e0d6ea6db5379a4075ab1
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
Diffstat (limited to 'src/oauth/qoauthhttpserverreplyhandler.cpp')
| -rw-r--r-- | src/oauth/qoauthhttpserverreplyhandler.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/oauth/qoauthhttpserverreplyhandler.cpp b/src/oauth/qoauthhttpserverreplyhandler.cpp index 72b5d01..8f56c3f 100644 --- a/src/oauth/qoauthhttpserverreplyhandler.cpp +++ b/src/oauth/qoauthhttpserverreplyhandler.cpp @@ -127,7 +127,7 @@ void QOAuthHttpServerReplyHandlerPrivate::_q_answerClient(QTcpSocket *socket, co text.toUtf8() + QByteArrayLiteral("</body></html>"); - const QByteArray htmlSize = QString::number(html.size()).toUtf8(); + const QByteArray htmlSize = QByteArray::number(html.size()); const QByteArray replyMessage = QByteArrayLiteral("HTTP/1.0 200 OK \r\n" "Content-Type: text/html; " "charset=\"utf-8\"\r\n" @@ -144,7 +144,8 @@ bool QOAuthHttpServerReplyHandlerPrivate::QHttpRequest::readMethod(QTcpSocket *s { bool finished = false; while (socket->bytesAvailable() && !finished) { - const auto c = socket->read(1).at(0); + char c; + socket->getChar(&c); if (std::isupper(c) && fragment.size() < 6) fragment += c; else @@ -176,7 +177,8 @@ bool QOAuthHttpServerReplyHandlerPrivate::QHttpRequest::readUrl(QTcpSocket *sock { bool finished = false; while (socket->bytesAvailable() && !finished) { - const auto c = socket->read(1).at(0); + char c; + socket->getChar(&c); if (std::isspace(c)) finished = true; else @@ -204,7 +206,9 @@ bool QOAuthHttpServerReplyHandlerPrivate::QHttpRequest::readStatus(QTcpSocket *s { bool finished = false; while (socket->bytesAvailable() && !finished) { - fragment += socket->read(1); + char c; + socket->getChar(&c); + fragment += c; if (fragment.endsWith("\r\n")) { finished = true; fragment.resize(fragment.size() - 2); @@ -227,7 +231,9 @@ bool QOAuthHttpServerReplyHandlerPrivate::QHttpRequest::readStatus(QTcpSocket *s bool QOAuthHttpServerReplyHandlerPrivate::QHttpRequest::readHeader(QTcpSocket *socket) { while (socket->bytesAvailable()) { - fragment += socket->read(1); + char c; + socket->getChar(&c); + fragment += c; if (fragment.endsWith("\r\n")) { if (fragment == "\r\n") { state = State::ReadingBody; |