Changeset 68248 in webkit

Timestamp:

Sep 24, 2010 5:44:42 AM (14 years ago)

Author:

yael.aharon@nokia.com

Message:

2010-09-24 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Web Sockets are insecure with QtWebKit
​https://bugs.webkit.org/show_bug.cgi?id=44769

Throw an error when the server certificate is not valid.
DRT currently does not support secure websocket connection,
so no new tests. This was tested with the server at
​http://code.google.com/p/pywebsocket instead.

• platform/network/qt/SocketStreamHandleQt.cpp: (WebCore::SocketStreamHandlePrivate::socketSslErrors):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/qt/SocketStreamHandleQt.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-24  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Web Sockets are insecure with QtWebKit
+        https://bugs.webkit.org/show_bug.cgi?id=44769
+
+        Throw an error when the server certificate is not valid.
+        DRT currently does not support secure websocket connection,
+        so no new tests. This was tested with the server at 
+        http://code.google.com/p/pywebsocket instead.
+
+        * platform/network/qt/SocketStreamHandleQt.cpp:
+        (WebCore::SocketStreamHandlePrivate::socketSslErrors):
+
 2010-09-24  Jia Pu  <jpu@apple.com>
 

trunk/WebCore/platform/network/qt/SocketStreamHandleQt.cpp

@@ -149 +149 @@
 
 #ifndef QT_NO_OPENSSL
-void SocketStreamHandlePrivate::socketSslErrors(const QList<QSslError>&)
-{
-    // FIXME: based on http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-68#page-15
-    // we should abort on certificate errors.
-    // We don't abort while this is still work in progress.
-    static_cast<QSslSocket*>(m_socket)->ignoreSslErrors();
+void SocketStreamHandlePrivate::socketSslErrors(const QList<QSslError>& error)
+{
+    QMetaObject::invokeMethod(this, "socketErrorCallback", Qt::QueuedConnection, Q_ARG(int, error[0].error()));
 }
 #endif