From 7aeea581882425be657123d2945c7165c7063aab Mon Sep 17 00:00:00 2001
From: Joni Poikelin <joni.poikelin@digia.com>
Date: Tue, 19 Aug 2014 15:35:57 +0300
Subject: Fix invalid Date header field in handshake response

Fix invalid Date header in handshake response on systems with non-
english system locale.

Task-number: QTBUG-40866
Change-Id: If6d5cc55e879eff259698e87c9cda753990245e7
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
---
 src/websockets/qwebsockethandshakeresponse.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/websockets/qwebsockethandshakeresponse.cpp b/src/websockets/qwebsockethandshakeresponse.cpp
index aa9a881..89a947c 100644
--- a/src/websockets/qwebsockethandshakeresponse.cpp
+++ b/src/websockets/qwebsockethandshakeresponse.cpp
@@ -49,6 +49,7 @@
 #include <QtCore/QByteArray>
 #include <QtCore/QStringList>
 #include <QtCore/QDateTime>
+#include <QtCore/QLocale>
 #include <QtCore/QCryptographicHash>
 #include <QtCore/QSet>
 #include <QtCore/QList>
@@ -186,14 +187,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;
-- 
cgit v1.2.1