summaryrefslogtreecommitdiff
path: root/src/websockets/qwebsocket_p.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-28 03:05:04 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-28 03:05:05 +0100
commitaebf8c35c18d78eb91c91c59448f641f08cabfd6 (patch)
tree9190215315b212fc944aa840a4384912f0044023 /src/websockets/qwebsocket_p.h
parent89746c4c329c28c309ee169fc5d30bfa9cb01ec7 (diff)
parent51dd88d8963920b850d79e22b1820d207e0569c7 (diff)
downloadqtwebsockets-aebf8c35c18d78eb91c91c59448f641f08cabfd6.tar.gz
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I7434fcdb376d1227fff3ebe28f614736e7efb395
Diffstat (limited to 'src/websockets/qwebsocket_p.h')
-rw-r--r--src/websockets/qwebsocket_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h
index e7c11f3..d0fa38c 100644
--- a/src/websockets/qwebsocket_p.h
+++ b/src/websockets/qwebsocket_p.h
@@ -249,7 +249,7 @@ private:
int m_httpStatusCode;
int m_httpMajorVersion, m_httpMinorVersion;
QString m_httpStatusMessage;
- QMap<QString, QString> m_headers;
+ QMultiMap<QString, QString> m_headers;
friend class QWebSocketServerPrivate;
#ifdef Q_OS_WASM