<!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>[208101] trunk</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/208101">208101</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-29 06:44:27 -0700 (Sat, 29 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (Safari 10 / <a href="http://trac.webkit.org/projects/webkit/changeset/189445">r189445</a>): WKWebView and WebView no longer allow async XMLHttpRequest timeout to exceed 60 seconds
https://bugs.webkit.org/show_bug.cgi?id=163814
<rdar://problem/28917420>
Patch by Youenn Fablet <youenn@apple.com> on 2016-10-29
Reviewed by Darin Adler.
Source/WebCore:
Tests: http/tests/xmlhttprequest/resetting-timeout-to-zero.html
http/tests/xmlhttprequest/timeout-greater-than-default-network-timeout.html
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::setTimeout): If the XHR timeout is active, resetting the timeout to zero should lead to using the default network timeout.
Since it is difficult to update the timeout once the request is sent, we mimic the default network timeout with a 60 seconds XHR timeout.
(WebCore::XMLHttpRequest::createRequest): Setting network timeout to infinity if the XHR timeout is active.
LayoutTests:
* http/tests/xmlhttprequest/resetting-timeout-to-zero-expected.txt: Added.
* http/tests/xmlhttprequest/resetting-timeout-to-zero.html: Added.
* http/tests/xmlhttprequest/timeout-greater-than-default-network-timeout-expected.txt: Added.
* http/tests/xmlhttprequest/timeout-greater-than-default-network-timeout.html: Added.
* tests-options.json:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTeststestsoptionsjson">trunk/LayoutTests/tests-options.json</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestresettingtimeouttozeroexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/resetting-timeout-to-zero-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestresettingtimeouttozerohtml">trunk/LayoutTests/http/tests/xmlhttprequest/resetting-timeout-to-zero.html</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequesttimeoutgreaterthandefaultnetworktimeoutexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/timeout-greater-than-default-network-timeout-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequesttimeoutgreaterthandefaultnetworktimeouthtml">trunk/LayoutTests/http/tests/xmlhttprequest/timeout-greater-than-default-network-timeout.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208100 => 208101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-29 13:43:06 UTC (rev 208100)
+++ trunk/LayoutTests/ChangeLog 2016-10-29 13:44:27 UTC (rev 208101)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-29 Youenn Fablet <youenn@apple.com>
+
+ REGRESSION (Safari 10 / r189445): WKWebView and WebView no longer allow async XMLHttpRequest timeout to exceed 60 seconds
+ https://bugs.webkit.org/show_bug.cgi?id=163814
+ <rdar://problem/28917420>
+
+ Reviewed by Darin Adler.
+
+ * http/tests/xmlhttprequest/resetting-timeout-to-zero-expected.txt: Added.
+ * http/tests/xmlhttprequest/resetting-timeout-to-zero.html: Added.
+ * http/tests/xmlhttprequest/timeout-greater-than-default-network-timeout-expected.txt: Added.
+ * http/tests/xmlhttprequest/timeout-greater-than-default-network-timeout.html: Added.
+ * tests-options.json:
+
</ins><span class="cx"> 2016-10-28 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Breakpoints not working in scripts with unicode characters
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestresettingtimeouttozeroexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/resetting-timeout-to-zero-expected.txt (0 => 208101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/resetting-timeout-to-zero-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/resetting-timeout-to-zero-expected.txt 2016-10-29 13:44:27 UTC (rev 208101)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+PASS Resetting a timeout to zero after sending the request
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestresettingtimeouttozerohtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/resetting-timeout-to-zero.html (0 => 208101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/resetting-timeout-to-zero.html (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/resetting-timeout-to-zero.html 2016-10-29 13:44:27 UTC (rev 208101)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>XMLHttpRequest: make timeouts bigger than default timeout</title>
+ <script src="/js-test-resources/testharness.js"></script>
+ <script src="/js-test-resources/testharnessreport.js"></script>
+ </head>
+ <body>
+ <script type="text/javascript">
+
+promise_test((test) => {
+ return new Promise((resolve, reject) => {
+ var xhr = new XMLHttpRequest();
+ var startTime = new Date();
+ xhr.open('GET', "/misc/resources/delayed-log.php?delay=10000000", true);
+
+ xhr.timeout = 70000; // time in milliseconds
+
+ xhr.onabort = () => { reject("onabort is called"); }
+ xhr.onload = () => { reject("onload is called"); };
+ xhr.onerror = () => { reject("onerror is called"); };
+ xhr.onloadend = () => { reject("onloadend is called but ontimeout was not"); };
+
+ xhr.ontimeout = function (e) {
+ var elapsed = new Date() - startTime;
+ if (elapsed > 65000 || elapsed < 55000) {
+ reject("elapsed time should be close to 60000 but is " + elapsed);
+ return;
+ }
+ resolve();
+ };
+
+ xhr.send(null);
+
+ xhr.timeout = 0;
+ });
+}, "Resetting a timeout to zero after sending the request");
+
+ </script>
+ </body>
+</html>
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequesttimeoutgreaterthandefaultnetworktimeoutexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/timeout-greater-than-default-network-timeout-expected.txt (0 => 208101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/timeout-greater-than-default-network-timeout-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/timeout-greater-than-default-network-timeout-expected.txt 2016-10-29 13:44:27 UTC (rev 208101)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+PASS Setting a timeout greater than network default
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequesttimeoutgreaterthandefaultnetworktimeouthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/timeout-greater-than-default-network-timeout.html (0 => 208101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/timeout-greater-than-default-network-timeout.html (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/timeout-greater-than-default-network-timeout.html 2016-10-29 13:44:27 UTC (rev 208101)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>XMLHttpRequest: make timeouts bigger than default timeout</title>
+ <script src="/js-test-resources/testharness.js"></script>
+ <script src="/js-test-resources/testharnessreport.js"></script>
+ </head>
+ <body>
+ <script type="text/javascript">
+
+promise_test((test) => {
+ return new Promise((resolve, reject) => {
+ var xhr = new XMLHttpRequest();
+ var startTime = new Date();
+ xhr.open('GET', "/misc/resources/delayed-log.php?delay=10000000", true);
+
+ xhr.timeout = 70000;
+
+ xhr.onabort = () => { reject("onabort is called"); }
+ xhr.onload = () => { reject("onload is called"); };
+ xhr.onerror = () => { reject("onerror is called"); };
+ xhr.onloadend = () => { reject("onloadend is called but ontimeout was not"); };
+
+ xhr.ontimeout = () => {
+ var elapsed = new Date() - startTime;
+ if (elapsed < 65000) {
+ reject("elapsed time should be greater than timeout value, got " + elapsed);
+ return;
+ }
+ resolve();
+ };
+
+ xhr.send(null);
+ });
+}, "Setting a timeout greater than network default");
+
+ </script>
+ </body>
+</html>
+
</ins></span></pre></div>
<a id="trunkLayoutTeststestsoptionsjson"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/tests-options.json (208100 => 208101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/tests-options.json 2016-10-29 13:43:06 UTC (rev 208100)
+++ trunk/LayoutTests/tests-options.json 2016-10-29 13:44:27 UTC (rev 208101)
</span><span class="lines">@@ -2,6 +2,12 @@
</span><span class="cx"> "http/tests/xmlhttprequest/on-network-timeout-error-during-preflight.html": [
</span><span class="cx"> "slow"
</span><span class="cx"> ],
</span><ins>+ "http/tests/xmlhttprequest/resetting-timeout-to-zero.html": [
+ "slow"
+ ],
+ "http/tests/xmlhttprequest/timeout-greater-than-default-network-timeout.html": [
+ "slow"
+ ],
</ins><span class="cx"> "imported/w3c/web-platform-tests/IndexedDB/idbcursor-continuePrimaryKey-exception-order.htm": [
</span><span class="cx"> "slow"
</span><span class="cx"> ],
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208100 => 208101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-29 13:43:06 UTC (rev 208100)
+++ trunk/Source/WebCore/ChangeLog 2016-10-29 13:44:27 UTC (rev 208101)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-10-29 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><ins>+ REGRESSION (Safari 10 / r189445): WKWebView and WebView no longer allow async XMLHttpRequest timeout to exceed 60 seconds
+ https://bugs.webkit.org/show_bug.cgi?id=163814
+ <rdar://problem/28917420>
+
+ Reviewed by Darin Adler.
+
+ Tests: http/tests/xmlhttprequest/resetting-timeout-to-zero.html
+ http/tests/xmlhttprequest/timeout-greater-than-default-network-timeout.html
+
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::setTimeout): If the XHR timeout is active, resetting the timeout to zero should lead to using the default network timeout.
+ Since it is difficult to update the timeout once the request is sent, we mimic the default network timeout with a 60 seconds XHR timeout.
+ (WebCore::XMLHttpRequest::createRequest): Setting network timeout to infinity if the XHR timeout is active.
+
+2016-10-29 Youenn Fablet <youenn@apple.com>
+
</ins><span class="cx"> MediaEndpoint::generateDtlsInfo is not needed
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=164130
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (208100 => 208101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2016-10-29 13:43:06 UTC (rev 208100)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2016-10-29 13:44:27 UTC (rev 208101)
</span><span class="lines">@@ -244,11 +244,9 @@
</span><span class="cx"> m_timeoutMilliseconds = timeout;
</span><span class="cx"> if (!m_timeoutTimer.isActive())
</span><span class="cx"> return { };
</span><del>- if (!m_timeoutMilliseconds) {
- m_timeoutTimer.stop();
- return { };
- }
- std::chrono::duration<double> interval = std::chrono::milliseconds { m_timeoutMilliseconds } - (std::chrono::steady_clock::now() - m_sendingTime);
</del><ins>+
+ // If timeout is zero, we should use the default network timeout. But we disabled it so let's mimic it with a 60 seconds timeout value.
+ std::chrono::duration<double> interval = std::chrono::milliseconds { m_timeoutMilliseconds ? m_timeoutMilliseconds : 60000 } - (std::chrono::steady_clock::now() - m_sendingTime);
</ins><span class="cx"> m_timeoutTimer.startOneShot(std::max(0.0, interval.count()));
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="lines">@@ -676,6 +674,7 @@
</span><span class="cx"> if (!m_async)
</span><span class="cx"> request.setTimeoutInterval(m_timeoutMilliseconds / 1000.0);
</span><span class="cx"> else {
</span><ins>+ request.setTimeoutInterval(std::numeric_limits<double>::infinity());
</ins><span class="cx"> m_sendingTime = std::chrono::steady_clock::now();
</span><span class="cx"> m_timeoutTimer.startOneShot(std::chrono::milliseconds { m_timeoutMilliseconds });
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>