Changeset 54134 in webkit
- Timestamp:
- Feb 1, 2010 7:03:26 AM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r54133 r54134 1 2010-02-01 Henry Haverinen <henry.haverinen@nokia.com> 2 3 Reviewed by Simon Hausmann. 4 5 [Qt] Build without SSL support is broken 6 7 Added missing #ifdefs for OpenSSL support and one null-pointer 8 check for the socket. 9 10 https://bugs.webkit.org/show_bug.cgi?id=34416 11 12 * platform/network/qt/SocketStreamHandlePrivate.h: 13 * platform/network/qt/SocketStreamHandleQt.cpp: 14 (WebCore::SocketStreamHandlePrivate::SocketStreamHandlePrivate): 15 (WebCore::SocketStreamHandlePrivate::send): 16 1 17 2010-02-01 Pavel Feldman <pfeldman@chromium.org> 2 18 -
trunk/WebCore/platform/network/qt/SocketStreamHandlePrivate.h
r53947 r54134 60 60 void socketClosedCallback(); 61 61 void socketErrorCallback(int); 62 #ifndef QT_NO_OPENSSL 62 63 void socketSslErrors(const QList<QSslError>&); 64 #endif 63 65 public: 64 66 QTcpSocket* m_socket; -
trunk/WebCore/platform/network/qt/SocketStreamHandleQt.cpp
r53947 r54134 46 46 m_socket = 0; 47 47 bool isSecure = url.protocolIs("wss"); 48 if (isSecure) 48 49 if (isSecure) { 50 #ifndef QT_NO_OPENSSL 49 51 m_socket = new QSslSocket(this); 50 else 52 #endif 53 } else 51 54 m_socket = new QTcpSocket(this); 55 56 if (!m_socket) 57 return; 58 52 59 connect(m_socket, SIGNAL(connected()), this, SLOT(socketConnected())); 53 60 connect(m_socket, SIGNAL(readyRead()), this, SLOT(socketReadyRead())); … … 60 67 61 68 QString host = url.host(); 62 if (isSecure) 69 if (isSecure) { 70 #ifndef QT_NO_OPENSSL 63 71 static_cast<QSslSocket*>(m_socket)->connectToHostEncrypted(host, port); 64 else 72 #endif 73 } else 65 74 m_socket->connectToHost(host, port); 66 75 } … … 89 98 int SocketStreamHandlePrivate::send(const char* data, int len) 90 99 { 91 if ( m_socket->state() != QAbstractSocket::ConnectedState)100 if (!m_socket || m_socket->state() != QAbstractSocket::ConnectedState) 92 101 return 0; 93 102 quint64 sentSize = m_socket->write(data, len); … … 139 148 } 140 149 150 #ifndef QT_NO_OPENSSL 141 151 void SocketStreamHandlePrivate::socketSslErrors(const QList<QSslError>&) 142 152 { … … 146 156 static_cast<QSslSocket*>(m_socket)->ignoreSslErrors(); 147 157 } 158 #endif 159 148 160 SocketStreamHandle::SocketStreamHandle(const KURL& url, SocketStreamHandleClient* client) 149 161 : SocketStreamHandleBase(url, client)
Note: See TracChangeset
for help on using the changeset viewer.