Attachment 264954 Details for Bug 150577 – Patch

[patch] Patch

bug-150577-20151106131749.patch (text/plain), 1.85 KB, created by Alex Christensen on 2015-11-06 13:18:49 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2015-11-06 13:18:49 PST

Size: 1.85 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 192119)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,17 @@
>+2015-11-06  Alex Christensen  <achristensen@webkit.org>
>+
>+        XHR timeouts should not fire if there is an immediate network error.
>+        https://bugs.webkit.org/show_bug.cgi?id=150577
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This fixes flakiness of http/tests/contentextensions/async-xhr-onerror.html since r191077.
>+
>+        * xml/XMLHttpRequest.cpp:
>+        (WebCore::XMLHttpRequest::createRequest):
>+        If the timeout timer has been started and we are going to immediately report a network error, then stop the timeout timer.
>+        The timeout timer sometimes fired before the network error timer if it was a very short timeout (such as 1ms).
>+
> 2015-11-06  Mario Sanchez Prada  <mario@endlessm.com>
> 
>         Layout Test accessibility/win/linked-elements.html is crashing on win debug
>Index: Source/WebCore/xml/XMLHttpRequest.cpp
>===================================================================
>--- Source/WebCore/xml/XMLHttpRequest.cpp	(revision 192093)
>+++ Source/WebCore/xml/XMLHttpRequest.cpp	(working copy)
>@@ -781,8 +781,11 @@ void XMLHttpRequest::createRequest(Excep
>         // a request is in progress because we need to keep the listeners alive,
>         // and they are referenced by the JavaScript wrapper.
>         setPendingActivity(this);
>-        if (!m_loader)
>+        if (!m_loader) {
>+            if (m_timeoutTimer.isActive())
>+                m_timeoutTimer.stop();
>             m_networkErrorTimer.startOneShot(0);
>+        }
>     } else {
>         InspectorInstrumentation::willLoadXHRSynchronously(scriptExecutionContext());
>         ThreadableLoader::loadResourceSynchronously(scriptExecutionContext(), request, *this, options);

Actions: View | Formatted Diff | Diff

Attachments on bug 150577: 264954 | 265081