<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[192305] releases/WebKitGTK/webkit-2.10</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/192305">192305</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-11 01:16:23 -0800 (Wed, 11 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192175">r192175</a> - XHR timeouts should not fire if there is an immediate network error.
https://bugs.webkit.org/show_bug.cgi?id=150577
Patch by Alex Christensen <achristensen@webkit.org> on 2015-11-09
Reviewed by Darin Adler.
Source/WebCore:
This fixes flakiness of http/tests/contentextensions/async-xhr-onerror.html since <a href="http://trac.webkit.org/projects/webkit/changeset/191077">r191077</a>.
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::createRequest):
(WebCore::XMLHttpRequest::internalAbort):
(WebCore::XMLHttpRequest::didFinishLoading):
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).
Also checks to isActive before calling stop on a timer are not necessary.
LayoutTests:
* platform/mac-wk2/TestExpectations:
http/tests/contentextensions/async-xhr-onerror.html shouldn't be flaky any more.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorexmlXMLHttpRequestcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (192304 => 192305)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-11-11 09:11:29 UTC (rev 192304)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-11-11 09:16:23 UTC (rev 192305)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-11-09 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 Darin Adler.
+
+ * platform/mac-wk2/TestExpectations:
+ http/tests/contentextensions/async-xhr-onerror.html shouldn't be flaky any more.
+
</ins><span class="cx"> 2015-10-14 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Make blocked async XHR call onerror
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (192304 => 192305)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-11-11 09:11:29 UTC (rev 192304)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-11-11 09:16:23 UTC (rev 192305)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-11-09 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 Darin Adler.
+
+ This fixes flakiness of http/tests/contentextensions/async-xhr-onerror.html since r191077.
+
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::createRequest):
+ (WebCore::XMLHttpRequest::internalAbort):
+ (WebCore::XMLHttpRequest::didFinishLoading):
+ 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).
+ Also checks to isActive before calling stop on a timer are not necessary.
+
</ins><span class="cx"> 2015-10-14 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Make blocked async XHR call onerror
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/xml/XMLHttpRequest.cpp (192304 => 192305)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/xml/XMLHttpRequest.cpp 2015-11-11 09:11:29 UTC (rev 192304)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/xml/XMLHttpRequest.cpp 2015-11-11 09:16:23 UTC (rev 192305)
</span><span class="lines">@@ -795,8 +795,10 @@
</span><span class="cx"> // a request is in progress because we need to keep the listeners alive,
</span><span class="cx"> // and they are referenced by the JavaScript wrapper.
</span><span class="cx"> setPendingActivity(this);
</span><del>- if (!m_loader)
</del><ins>+ if (!m_loader) {
+ m_timeoutTimer.stop();
</ins><span class="cx"> m_networkErrorTimer.startOneShot(0);
</span><ins>+ }
</ins><span class="cx"> } else {
</span><span class="cx"> InspectorInstrumentation::willLoadXHRSynchronously(scriptExecutionContext());
</span><span class="cx"> ThreadableLoader::loadResourceSynchronously(scriptExecutionContext(), request, *this, options);
</span><span class="lines">@@ -844,8 +846,7 @@
</span><span class="cx"> m_decoder = nullptr;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(XHR_TIMEOUT)
</span><del>- if (m_timeoutTimer.isActive())
- m_timeoutTimer.stop();
</del><ins>+ m_timeoutTimer.stop();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (!m_loader)
</span><span class="lines">@@ -1140,8 +1141,7 @@
</span><span class="cx"> m_decoder = nullptr;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(XHR_TIMEOUT)
</span><del>- if (m_timeoutTimer.isActive())
- m_timeoutTimer.stop();
</del><ins>+ m_timeoutTimer.stop();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (hadLoader)
</span></span></pre>
</div>
</div>
</body>
</html>