Commit 455450f8 authored by yutak@chromium.org's avatar yutak@chromium.org

[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.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@100891 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 385a2709
2011-11-21 Yuta Kitamura <yutak@chromium.org>
[Qt] WebSocket close tests are failing
https://bugs.webkit.org/show_bug.cgi?id=72865
Reviewed by Simon Hausmann.
* platform/qt/Skipped:
Unskip five WebSocket tests. Remove "failing websocket tests" section,
as there are no tests in this section.
2011-11-20 Shinya Kawanaka <shinyak@google.com>
[Chromium] Layout test does not return correct misspelling positions if there are multiple misspelled words.
......@@ -44,7 +44,6 @@
# - Failed canvas tests from http://philip.html5.org/tests/canvas/suite/tests/
# - failing transforms tests
# - failing printing tests
# - failing websocket tests
# - new tests without expected results
# - Qt 4.7 related bugs
# - Qt 4.8 related bugs
......@@ -1601,17 +1600,6 @@ printing/compositing-layer-printing.html
# https://bugs.webkit.org/show_bug.cgi?id=27913
printing/media-queries-print.html
# ============================================================================= #
# failing websocket tests
# ============================================================================= #
# SocketStreamHandleQt seems to have some bug in platformClose() behavior.
http/tests/websocket/tests/hybi/close-before-open.html
http/tests/websocket/tests/hybi/close-code-and-reason.html
http/tests/websocket/tests/hybi/close.html
http/tests/websocket/tests/hybi/workers/close.html
http/tests/websocket/tests/hybi/workers/close-code-and-reason.html
# ============================================================================= #
# new tests without expected results
# ============================================================================= #
......
2011-11-21 Yuta Kitamura <yutak@chromium.org>
[Qt] WebSocket close tests are failing
https://bugs.webkit.org/show_bug.cgi?id=72865
Reviewed by Simon Hausmann.
* 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.
2011-11-21 Shinya Kawanaka <shinyak@google.com>
Refactoring: SpellChecker::requestCheckingFor should take Range instead of Node.
......@@ -106,6 +106,11 @@ int SocketStreamHandlePrivate::send(const char* data, int len)
void SocketStreamHandlePrivate::close()
{
if (m_streamHandle->m_state == SocketStreamHandleBase::Connecting) {
m_socket->abort();
m_streamHandle->client()->didCloseSocketStream(m_streamHandle);
return;
}
if (m_socket && m_socket->state() == QAbstractSocket::ConnectedState)
m_socket->close();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment