Changeset 100891 in webkit


Ignore:
Timestamp:
Nov 21, 2011 1:42:57 AM (12 years ago)
Author:
yutak@chromium.org
Message:

[Qt] WebSocket close tests are failing
https://bugs.webkit.org/show_bug.cgi?id=72865

Reviewed by Simon Hausmann.

Source/WebCore:

  • platform/network/qt/SocketStreamHandleQt.cpp:

(WebCore::SocketStreamHandlePrivate::close):
Emit didCloseSocketStream() callback even before the connection is established.
Call m_socket->abort() to prevent "connected" signal from firing.

LayoutTests:

  • platform/qt/Skipped:

Unskip five WebSocket tests. Remove "failing websocket tests" section,
as there are no tests in this section.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r100887 r100891  
     12011-11-21  Yuta Kitamura  <yutak@chromium.org>
     2
     3        [Qt] WebSocket close tests are failing
     4        https://bugs.webkit.org/show_bug.cgi?id=72865
     5
     6        Reviewed by Simon Hausmann.
     7
     8        * platform/qt/Skipped:
     9        Unskip five WebSocket tests. Remove "failing websocket tests" section,
     10        as there are no tests in this section.
     11
    1122011-11-20  Shinya Kawanaka  <shinyak@google.com>
    213
  • trunk/LayoutTests/platform/qt/Skipped

    r100845 r100891  
    4545# - failing transforms tests
    4646# - failing printing tests
    47 # - failing websocket tests
    4847# - new tests without expected results
    4948# - Qt 4.7 related bugs
     
    16031602
    16041603# ============================================================================= #
    1605 # failing websocket tests
    1606 # ============================================================================= #
    1607 
    1608 # SocketStreamHandleQt seems to have some bug in platformClose() behavior.
    1609 http/tests/websocket/tests/hybi/close-before-open.html
    1610 http/tests/websocket/tests/hybi/close-code-and-reason.html
    1611 http/tests/websocket/tests/hybi/close.html
    1612 http/tests/websocket/tests/hybi/workers/close.html
    1613 http/tests/websocket/tests/hybi/workers/close-code-and-reason.html
    1614 
    1615 # ============================================================================= #
    16161604# new tests without expected results
    16171605# ============================================================================= #
  • trunk/Source/WebCore/ChangeLog

    r100890 r100891  
     12011-11-21  Yuta Kitamura  <yutak@chromium.org>
     2
     3        [Qt] WebSocket close tests are failing
     4        https://bugs.webkit.org/show_bug.cgi?id=72865
     5
     6        Reviewed by Simon Hausmann.
     7
     8        * platform/network/qt/SocketStreamHandleQt.cpp:
     9        (WebCore::SocketStreamHandlePrivate::close):
     10        Emit didCloseSocketStream() callback even before the connection is established.
     11        Call m_socket->abort() to prevent "connected" signal from firing.
     12
    1132011-11-21  Shinya Kawanaka  <shinyak@google.com>
    214
  • trunk/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp

    r95901 r100891  
    107107void SocketStreamHandlePrivate::close()
    108108{
     109    if (m_streamHandle->m_state == SocketStreamHandleBase::Connecting) {
     110        m_socket->abort();
     111        m_streamHandle->client()->didCloseSocketStream(m_streamHandle);
     112        return;
     113    }
    109114    if (m_socket && m_socket->state() == QAbstractSocket::ConnectedState)
    110115        m_socket->close();
Note: See TracChangeset for help on using the changeset viewer.