diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-11-03 13:48:18 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-11-03 13:48:23 +0100 |
| commit | 44a071396e91de32eb3efd12a1ed230ed1632aea (patch) | |
| tree | c6e514d3dd1e1503bb6df0eaa12714e97b8d625e /src/websockets/qwebsockethandshakeresponse.cpp | |
| parent | 0854eda408de542047a0ef38c37953719a8f9fde (diff) | |
| parent | 7aeea581882425be657123d2945c7165c7063aab (diff) | |
| download | qtwebsockets-44a071396e91de32eb3efd12a1ed230ed1632aea.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I0e89ede5ea173f2e831c42d250ddb2b21b42b89b
Diffstat (limited to 'src/websockets/qwebsockethandshakeresponse.cpp')
| -rw-r--r-- | src/websockets/qwebsockethandshakeresponse.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/websockets/qwebsockethandshakeresponse.cpp b/src/websockets/qwebsockethandshakeresponse.cpp index d8fa5cf..a3963cd 100644 --- a/src/websockets/qwebsockethandshakeresponse.cpp +++ b/src/websockets/qwebsockethandshakeresponse.cpp @@ -41,6 +41,7 @@ #include <QtCore/QByteArray> #include <QtCore/QStringList> #include <QtCore/QDateTime> +#include <QtCore/QLocale> #include <QtCore/QCryptographicHash> #include <QtCore/QSet> #include <QtCore/QList> @@ -178,14 +179,15 @@ QString QWebSocketHandshakeResponse::getHandshakeResponse( } else { if (origin.isEmpty()) origin = QStringLiteral("*"); + QDateTime datetime = QDateTime::currentDateTimeUtc(); response << QStringLiteral("Server: ") % serverName << QStringLiteral("Access-Control-Allow-Credentials: false") << QStringLiteral("Access-Control-Allow-Methods: GET") << QStringLiteral("Access-Control-Allow-Headers: content-type") << QStringLiteral("Access-Control-Allow-Origin: ") % origin << - QStringLiteral("Date: ") % - QDateTime::currentDateTimeUtc() - .toString(QStringLiteral("ddd, dd MMM yyyy hh:mm:ss 'GMT'")); + QStringLiteral("Date: ") % QLocale::c() + .toString(datetime, QStringLiteral("ddd, dd MMM yyyy hh:mm:ss 'GMT'")); + m_acceptedVersion = QWebSocketProtocol::currentVersion(); m_canUpgrade = true; |