Changeset 54134 in webkit


Ignore:
Timestamp:
Feb 1, 2010 7:03:26 AM (14 years ago)
Author:
Simon Hausmann
Message:

[Qt] Build without SSL support is broken

Patch by Henry Haverinen <Henry Haverinen> on 2010-02-01
Reviewed by Simon Hausmann.

Added missing #ifdefs for OpenSSL support and one null-pointer
check for the socket.

https://bugs.webkit.org/show_bug.cgi?id=34416

  • platform/network/qt/SocketStreamHandlePrivate.h:
  • platform/network/qt/SocketStreamHandleQt.cpp:

(WebCore::SocketStreamHandlePrivate::SocketStreamHandlePrivate):
(WebCore::SocketStreamHandlePrivate::send):

Location:
trunk/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r54133 r54134  
     12010-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
    1172010-02-01  Pavel Feldman  <pfeldman@chromium.org>
    218
  • trunk/WebCore/platform/network/qt/SocketStreamHandlePrivate.h

    r53947 r54134  
    6060    void socketClosedCallback();
    6161    void socketErrorCallback(int);
     62#ifndef QT_NO_OPENSSL
    6263    void socketSslErrors(const QList<QSslError>&);
     64#endif
    6365public:
    6466    QTcpSocket* m_socket;
  • trunk/WebCore/platform/network/qt/SocketStreamHandleQt.cpp

    r53947 r54134  
    4646    m_socket = 0;
    4747    bool isSecure = url.protocolIs("wss");
    48     if (isSecure)
     48
     49    if (isSecure) {
     50#ifndef QT_NO_OPENSSL
    4951        m_socket = new QSslSocket(this);
    50     else
     52#endif
     53    } else
    5154        m_socket = new QTcpSocket(this);
     55
     56    if (!m_socket)
     57        return;
     58
    5259    connect(m_socket, SIGNAL(connected()), this, SLOT(socketConnected()));
    5360    connect(m_socket, SIGNAL(readyRead()), this, SLOT(socketReadyRead()));
     
    6067
    6168    QString host = url.host();
    62     if (isSecure)
     69    if (isSecure) {
     70#ifndef QT_NO_OPENSSL
    6371        static_cast<QSslSocket*>(m_socket)->connectToHostEncrypted(host, port);
    64     else
     72#endif
     73    } else
    6574        m_socket->connectToHost(host, port);
    6675}
     
    8998int SocketStreamHandlePrivate::send(const char* data, int len)
    9099{
    91     if (m_socket->state() != QAbstractSocket::ConnectedState)
     100    if (!m_socket || m_socket->state() != QAbstractSocket::ConnectedState)
    92101        return 0;
    93102    quint64 sentSize = m_socket->write(data, len);
     
    139148}
    140149
     150#ifndef QT_NO_OPENSSL
    141151void SocketStreamHandlePrivate::socketSslErrors(const QList<QSslError>&)
    142152{
     
    146156    static_cast<QSslSocket*>(m_socket)->ignoreSslErrors();
    147157}
     158#endif
     159
    148160SocketStreamHandle::SocketStreamHandle(const KURL& url, SocketStreamHandleClient* client)
    149161    : SocketStreamHandleBase(url, client)
Note: See TracChangeset for help on using the changeset viewer.