[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[yael.aharon at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 137c113717f05b0ab83dcee8d3a1eb4f13dfa4d1
Author: yael.aharon at nokia.com <yael.aharon at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 24 12:44:42 2010 +0000

    2010-09-24  Yael Aharon  <yael.aharon at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68248 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f8ba6d3..d3f90fa 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-24  Yael Aharon  <yael.aharon at 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 at apple.com>
 
         Reviewed by Shinichiro Hamaji.
diff --git a/WebCore/platform/network/qt/SocketStreamHandleQt.cpp b/WebCore/platform/network/qt/SocketStreamHandleQt.cpp
index e666ff7..cc508b6 100644
--- a/WebCore/platform/network/qt/SocketStreamHandleQt.cpp
+++ b/WebCore/platform/network/qt/SocketStreamHandleQt.cpp
@@ -148,12 +148,9 @@ void SocketStreamHandlePrivate::socketErrorCallback(int error)
 }
 
 #ifndef QT_NO_OPENSSL
-void SocketStreamHandlePrivate::socketSslErrors(const QList<QSslError>&)
+void SocketStreamHandlePrivate::socketSslErrors(const QList<QSslError>& error)
 {
-    // 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();
+    QMetaObject::invokeMethod(this, "socketErrorCallback", Qt::QueuedConnection, Q_ARG(int, error[0].error()));
 }
 #endif
 

-- 
WebKit Debian packaging