Changeset 100891 in webkit
- Timestamp:
- Nov 21, 2011 1:42:57 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r100887 r100891 1 2011-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 1 12 2011-11-20 Shinya Kawanaka <shinyak@google.com> 2 13 -
trunk/LayoutTests/platform/qt/Skipped
r100845 r100891 45 45 # - failing transforms tests 46 46 # - failing printing tests 47 # - failing websocket tests48 47 # - new tests without expected results 49 48 # - Qt 4.7 related bugs … … 1603 1602 1604 1603 # ============================================================================= # 1605 # failing websocket tests1606 # ============================================================================= #1607 1608 # SocketStreamHandleQt seems to have some bug in platformClose() behavior.1609 http/tests/websocket/tests/hybi/close-before-open.html1610 http/tests/websocket/tests/hybi/close-code-and-reason.html1611 http/tests/websocket/tests/hybi/close.html1612 http/tests/websocket/tests/hybi/workers/close.html1613 http/tests/websocket/tests/hybi/workers/close-code-and-reason.html1614 1615 # ============================================================================= #1616 1604 # new tests without expected results 1617 1605 # ============================================================================= # -
trunk/Source/WebCore/ChangeLog
r100890 r100891 1 2011-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 1 13 2011-11-21 Shinya Kawanaka <shinyak@google.com> 2 14 -
trunk/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp
r95901 r100891 107 107 void SocketStreamHandlePrivate::close() 108 108 { 109 if (m_streamHandle->m_state == SocketStreamHandleBase::Connecting) { 110 m_socket->abort(); 111 m_streamHandle->client()->didCloseSocketStream(m_streamHandle); 112 return; 113 } 109 114 if (m_socket && m_socket->state() == QAbstractSocket::ConnectedState) 110 115 m_socket->close();
Note: See TracChangeset
for help on using the changeset viewer.