summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMilian Wolff <milian.wolff@kdab.com>2013-10-23 10:29:17 +0200
committerPierre Rossi <pierre.rossi@gmail.com>2013-11-01 13:57:51 +0100
commit1ea921be1d4536e1731df53463834e5888d7115f (patch)
tree0604d2da29b2137636ae7f3a3d0f224615b332f3 /src
parent081b8783a946b70a461219a2e40caed2761f6812 (diff)
downloadqtwebchannel-1ea921be1d4536e1731df53463834e5888d7115f.tar.gz
Optimize: Share more byte array literals.
Change-Id: Id7b35aab5012e1eba84fb3685b3bc6619aa92580 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/qwebsocketserver.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/qwebsocketserver.cpp b/src/qwebsocketserver.cpp
index 334d1a5..1364ed0 100644
--- a/src/qwebsocketserver.cpp
+++ b/src/qwebsocketserver.cpp
@@ -152,6 +152,8 @@ static const QByteArray headerSecVersion = QByteArrayLiteral("Sec-WebSocket-Vers
static const QByteArray headerSecAccept = QByteArrayLiteral("Sec-WebSocket-Accept: ");
static const QByteArray headerOrigin = QByteArrayLiteral("Origin: ");
static const QByteArray headerMagicKey = QByteArrayLiteral("258EAFA5-E914-47DA-95CA-C5AB0DC85B11");
+static const QByteArray headerEOL = QByteArrayLiteral("\r\n");
+static const QByteArray httpBadRequest = QByteArrayLiteral("HTTP/1.1 400 Bad Request\r\n");
void QWebSocketServer::readSocketData()
{
@@ -344,7 +346,7 @@ void QWebSocketServer::close(QTcpSocket* socket, const HeaderData& header)
//TODO: implement this properly - see http://tools.ietf.org/html/rfc6455#page-36
socket->write(frameHeader(Frame::Frame::ConnectionClose, 0));
} else {
- socket->write("HTTP/1.1 400 Bad Request\r\n");
+ socket->write(httpBadRequest);
}
socket->close();
}
@@ -352,25 +354,25 @@ void QWebSocketServer::close(QTcpSocket* socket, const HeaderData& header)
void QWebSocketServer::upgrade(QTcpSocket* socket, HeaderData& header)
{
socket->write(headerSwitchProtocols);
- socket->write("\r\n");
+ socket->write(headerEOL);
socket->write(headerUpgrade);
- socket->write("\r\n");
+ socket->write(headerEOL);
socket->write(headerConnection);
- socket->write("\r\n");
+ socket->write(headerEOL);
socket->write(headerSecAccept);
socket->write(QCryptographicHash::hash( header.key + headerMagicKey, QCryptographicHash::Sha1 ).toBase64());
- socket->write("\r\n");
+ socket->write(headerEOL);
if (!header.protocol.isEmpty()) {
socket->write(headerSecProtocol);
socket->write(header.protocol);
- socket->write("\r\n");
+ socket->write(headerEOL);
}
- socket->write("\r\n");
+ socket->write(headerEOL);
header.wasUpgraded = true;
}