diff options
| author | Florian Bruhin <git@the-compiler.org> | 2015-11-04 21:35:31 +0100 |
|---|---|---|
| committer | Florian Bruhin <qt-project.org@the-compiler.org> | 2015-11-05 09:26:02 +0000 |
| commit | 06b0ebd66fb1a7c536c96572ad8a3b55b713b177 (patch) | |
| tree | d3ae9ca6345239929cc4c48f2fff6bf24c1867ce | |
| parent | 2caa61dc485dc7d38c847ed6c6cff774fcf80061 (diff) | |
| download | qtwebkit-06b0ebd66fb1a7c536c96572ad8a3b55b713b177.tar.gz | |
Check QT_NO_SSL in SocketStreamHandleQt.
Since Qt 5.5, Secure Transport is used instead of OpenSSL on OS X. This means
secure websockets (wss://) were disabled on OS X despite QSslSocket being
available.
Change-Id: Ic584a6ed81b625c84a85e54dba84c8fc920b861a
Task-number: QTBUG-49027
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
| -rw-r--r-- | Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h | 2 | ||||
| -rw-r--r-- | Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h b/Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h index f447cc206..647c4efa5 100644 --- a/Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h +++ b/Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h @@ -60,7 +60,7 @@ public Q_SLOTS: void socketError(QAbstractSocket::SocketError); void socketClosedCallback(); void socketErrorCallback(int); -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL void socketSslErrors(const QList<QSslError>&); #endif public: diff --git a/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp b/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp index d4cbdc78c..cd711907e 100644 --- a/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp +++ b/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp @@ -48,7 +48,7 @@ SocketStreamHandlePrivate::SocketStreamHandlePrivate(SocketStreamHandle* streamH bool isSecure = url.protocolIs("wss"); if (isSecure) { -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL m_socket = new QSslSocket(this); #endif } else @@ -63,7 +63,7 @@ SocketStreamHandlePrivate::SocketStreamHandlePrivate(SocketStreamHandle* streamH QString host = url.host(); if (isSecure) { -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL static_cast<QSslSocket*>(m_socket)->connectToHostEncrypted(host, port); #endif } else @@ -88,7 +88,7 @@ void SocketStreamHandlePrivate::initConnections() connect(m_socket, SIGNAL(readyRead()), this, SLOT(socketReadyRead())); connect(m_socket, SIGNAL(disconnected()), this, SLOT(socketClosed())); connect(m_socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(socketError(QAbstractSocket::SocketError))); -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL if (qobject_cast<QSslSocket*>(m_socket)) connect(m_socket, SIGNAL(sslErrors(const QList<QSslError>&)), this, SLOT(socketSslErrors(const QList<QSslError>&))); #endif @@ -176,7 +176,7 @@ void SocketStreamHandlePrivate::socketErrorCallback(int error) } } -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL void SocketStreamHandlePrivate::socketSslErrors(const QList<QSslError>& error) { QMetaObject::invokeMethod(this, "socketErrorCallback", Qt::QueuedConnection, Q_ARG(int, error[0].error())); |