<!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>[187554] branches/safari-600.1.4.17-branch</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/187554">187554</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-07-29 13:10:54 -0700 (Wed, 29 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Roll out <a href="http://trac.webkit.org/projects/webkit/changeset/185848">r185848</a>. rdar://problem/21708274</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001417branchLayoutTestsChangeLog">branches/safari-600.1.4.17-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001417branchSourceWebCoreChangeLog">branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001417branchSourceWebCoreModuleswebsocketsWebSocketcpp">branches/safari-600.1.4.17-branch/Source/WebCore/Modules/websockets/WebSocket.cpp</a></li>
<li><a href="#branchessafari6001417branchSourceWebCoreplatformSchemeRegistrycpp">branches/safari-600.1.4.17-branch/Source/WebCore/platform/SchemeRegistry.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branchessafari6001417branchLayoutTestshttptestssecuritymixedContentresourcesframewithinsecurewebsockethtml">branches/safari-600.1.4.17-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html</a></li>
<li>branches/safari-600.1.4.17-branch/LayoutTests/http/tests/security/mixedContent/websocket/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001417branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/LayoutTests/ChangeLog (187553 => 187554)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/LayoutTests/ChangeLog 2015-07-29 20:10:21 UTC (rev 187553)
+++ branches/safari-600.1.4.17-branch/LayoutTests/ChangeLog 2015-07-29 20:10:54 UTC (rev 187554)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2015-07-29 Babak Shafiei <bshafiei@apple.com>
+
+ Roll out r185848.
+
</ins><span class="cx"> 2015-07-27 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Roll out r180020.
</span></span></pre></div>
<a id="branchessafari6001417branchLayoutTestshttptestssecuritymixedContentresourcesframewithinsecurewebsockethtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-600.1.4.17-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html (187553 => 187554)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html 2015-07-29 20:10:21 UTC (rev 187553)
+++ branches/safari-600.1.4.17-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html 2015-07-29 20:10:54 UTC (rev 187554)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-<script src="../../../../../js-test-resources/js-test-pre.js"></script>
-<script>
-window.jsTestIsAsync = true;
-
-function onSocketOpened() {
- alert("WebSocket connection opened.");
- finishJSTest();
-}
-
-function onSocketError() {
- alert("WebSocket connection failed.");
- finishJSTest();
-}
-
-function onSocketClosed() {
- alert("WebSocket closed.");
- finishJSTest();
-}
-
-try {
- var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/echo");
- ws.onopen = onSocketOpened;
- ws.onerror = onSocketError;
- ws.onclose = onSocketClosed;
-} catch (e) {
- alert("Test failed: exception thrown");
- finishJSTest();
-}
-</script>
-<script src="../../../../js-test-resources/js-test-post.js"></script>
</del></span></pre></div>
<a id="branchessafari6001417branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog (187553 => 187554)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog 2015-07-29 20:10:21 UTC (rev 187553)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog 2015-07-29 20:10:54 UTC (rev 187554)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2015-07-29 Babak Shafiei <bshafiei@apple.com>
+
+ Roll out r185848.
+
</ins><span class="cx"> 2015-07-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r187490.
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebCoreModuleswebsocketsWebSocketcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebCore/Modules/websockets/WebSocket.cpp (187553 => 187554)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/Modules/websockets/WebSocket.cpp 2015-07-29 20:10:21 UTC (rev 187553)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/Modules/websockets/WebSocket.cpp 2015-07-29 20:10:54 UTC (rev 187554)
</span><span class="lines">@@ -57,7 +57,6 @@
</span><span class="cx"> #include <runtime/ArrayBufferView.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><del>-#include <wtf/RunLoop.h>
</del><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="lines">@@ -279,23 +278,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (scriptExecutionContext()->isDocument()) {
- Document& document = toDocument(*scriptExecutionContext());
- if (!document.frame()->loader().mixedContentChecker().canRunInsecureContent(document.securityOrigin(), m_url)) {
- // Balanced by the call to ActiveDOMObject::unsetPendingActivity() in WebSocket::stop().
- ActiveDOMObject::setPendingActivity(this);
- // We must block this connection. Instead of throwing an exception, we indicate this
- // using the error event. But since this code executes as part of the WebSocket's
- // constructor, we have to wait until the constructor has completed before firing the
- // event; otherwise, users can't connect to the event.
- RunLoop::main().dispatch([this]() {
- dispatchEvent(Event::create(eventNames().errorEvent, false, false));
- stop();
- });
- return;
- }
- }
-
</del><span class="cx"> String protocolString;
</span><span class="cx"> if (!protocols.isEmpty())
</span><span class="cx"> protocolString = joinStrings(protocols, subProtocolSeperator());
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebCoreplatformSchemeRegistrycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebCore/platform/SchemeRegistry.cpp (187553 => 187554)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/platform/SchemeRegistry.cpp 2015-07-29 20:10:21 UTC (rev 187553)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/platform/SchemeRegistry.cpp 2015-07-29 20:10:54 UTC (rev 187554)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> secureSchemes.add("https");
</span><span class="cx"> secureSchemes.add("about");
</span><span class="cx"> secureSchemes.add("data");
</span><del>- secureSchemes.add("wss");
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return secureSchemes;
</span></span></pre>
</div>
</div>
</body>
</html>